@fonixtree/magic-design 1.0.126 → 1.0.130

package/lib/composite-comp/dito/components/CommonFunctions/defaultJSON.js

@@ -20,8 +20,8 @@ var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON(tex
       text: text || 'Chat With Us',
       content: {
         sizeType: 'Customize font styles',
-        fontFamily: 'Open Sans',
-        fontWeight: 600,
+        fontFamily: 'Montserrat',
+        fontWeight: 500,
         fontSize: 14,
         color: '#2C2C2C',
         width: 0,

package/lib/composite-comp/dito/components/CommonFunctions/mobile/index.js

@@ -9,12 +9,16 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
+
 var _components = require("../../../../../meta-comp/components");
 
 var _common = require("../../../../../common");
 
 var _commonUtil = require("../../../../../utils/commonUtil");
 
+var _storeUtil = require("../../../../../utils/storeUtil");
+
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -71,11 +75,15 @@ function (_super) {
     var _this = this;
 
     var data = this.props.data;
+    var LPObj = (0, _storeUtil.getSessionStore)('channelPurchase') || {};
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('common-functions-mobile')
     }, /*#__PURE__*/_react["default"].createElement("ul", null, data.groupSource.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement("li", {
         key: item.id,
+        className: (0, _classnames["default"])({
+          hide: !(0, _isEmpty["default"])(LPObj) && item.title.text === 'Security Center'
+        }),
         onClick: function onClick() {
           return _this.onItemClick(item);
         }

package/lib/composite-comp/dito/components/CommonFunctions/mobile/index.less

@@ -14,6 +14,9 @@
   justify-content: space-between;
   align-items: center;
 }
+.common-functions-mobile ul li.hide {
+  display: none;
+}
 .common-functions-mobile ul li .content-wrap {
   display: flex;
   align-items: center;

package/lib/composite-comp/dito/components/PersonalInformation/defaultJSON.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getDefaultJSON = exports.PersonalInfoGroupSourceJSON = void 0;
+exports.getDefaultJSON = exports.PersonalInfoGroupSourceJSON = exports.OrdersGroupSourceJSON = void 0;
 
 var _uuid = require("uuid");
 
@@ -20,8 +20,8 @@ var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON(text) {
       text: text || 'Name',
       content: {
         sizeType: 'Customize font styles',
-        fontFamily: 'Open Sans',
-        fontWeight: 400,
+        fontFamily: 'Montserrat',
+        fontWeight: 500,
         fontSize: 12,
         color: '#fff',
         width: 0,
@@ -43,7 +43,7 @@ var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON(text) {
       text: 0,
       content: {
         sizeType: 'Customize font styles',
-        fontFamily: 'Open Sans',
+        fontFamily: 'Montserrat',
         fontWeight: 600,
         fontSize: 18,
         color: '#fff',
@@ -63,6 +63,59 @@ var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON(text) {
 
 exports.PersonalInfoGroupSourceJSON = PersonalInfoGroupSourceJSON;
 
+var OrdersGroupSourceJSON = function OrdersGroupSourceJSON(text) {
+  var groupId = (0, _uuid.v4)();
+  return {
+    id: groupId,
+    title: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'TEXT',
+      specialContent: [],
+      text: text || 'Name',
+      content: {
+        sizeType: 'Customize font styles',
+        fontFamily: 'Montserrat',
+        fontWeight: 500,
+        fontSize: 12,
+        color: '#2C2C2C',
+        width: 0,
+        textAlign: 'center'
+      },
+      underline: {
+        open: false,
+        textDecorationColor: '',
+        textDecorationStyle: 'solid'
+      },
+      vertical: {}
+    },
+    image: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'IMAGE',
+      content: {
+        h5Name: 'name2',
+        pcName: 'name2',
+        h5ImgSrc: '',
+        pcImgSrc: '',
+        clickUrl: ''
+      },
+      hover: {
+        open: false,
+        backgroundType: 'enlarge',
+        magnification: 1.5,
+        pcImgHoverUrl: '',
+        h5ImgHoverUrl: ''
+      }
+    },
+    sourceType: text
+  };
+};
+
+exports.OrdersGroupSourceJSON = OrdersGroupSourceJSON;
+
 var getDefaultJSON = function getDefaultJSON() {
   return {
     id: (0, _uuid.v4)(),
@@ -90,6 +143,7 @@ var getDefaultJSON = function getDefaultJSON() {
       }
     },
     groupSource: [PersonalInfoGroupSourceJSON('Wishlist'), PersonalInfoGroupSourceJSON('Stores'), PersonalInfoGroupSourceJSON('Vouchers'), PersonalInfoGroupSourceJSON('Recently Viewed')],
+    groupSource2: [OrdersGroupSourceJSON('To Pay'), OrdersGroupSourceJSON('To Ship'), OrdersGroupSourceJSON('To Receive'), OrdersGroupSourceJSON('Done'), OrdersGroupSourceJSON('Cancelled')],
     spacing: {
       pc: {
         paddingTop: 0,

package/lib/composite-comp/dito/components/PersonalInformation/mobile/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setAccountPageValue = exports.pInfoData = exports["default"] = void 0;
+exports.setAccountPageValue = exports.pInfoData = exports.orderData = exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -15,6 +15,8 @@ var _antd = require("antd");
 
 var _avatar = _interopRequireDefault(require("./images/avatar.png"));
 
+var _coreUtil = require("../../../../../utils/coreUtil");
+
 var _components = require("../../../../../meta-comp/components");
 
 var _androidUtil = require("../../../../../utils/androidUtil");
@@ -220,6 +222,20 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
+var currentUser = JSON.parse(localStorage.getItem('currentUser')) || {};
+
+var setAccountPageValue = function setAccountPageValue(obj) {
+  var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
+  localStorage.setItem('accountPageValue', JSON.stringify(__assign(__assign({}, accountPageValue), obj)));
+};
+
+exports.setAccountPageValue = setAccountPageValue;
+
+var getAccountPageValue = function getAccountPageValue(key) {
+  var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
+  return accountPageValue ? accountPageValue[key] || '' : '';
+};
+
 var pInfoData = {
   Wishlist: {
     route: '/favourite/list'
@@ -235,15 +251,29 @@ var pInfoData = {
   }
 };
 exports.pInfoData = pInfoData;
-var LPObj = (0, _storeUtil.getSessionStore)('channelPurchase') || {};
-var currentUser = JSON.parse(localStorage.getItem('currentUser')) || {};
-
-var setAccountPageValue = function setAccountPageValue(obj) {
-  var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
-  localStorage.setItem('accountPageValue', JSON.stringify(__assign(__assign({}, accountPageValue), obj)));
+var orderData = {
+  'To Pay': {
+    key: 'toPayNum',
+    route: '/main/order/1'
+  },
+  'To Ship': {
+    key: 'toDeliveryNum',
+    route: '/main/order/2'
+  },
+  'To Receive': {
+    key: 'toReceiveNum',
+    route: '/main/order/3'
+  },
+  Done: {
+    key: 'toRatingNum',
+    route: '/main/order/4'
+  },
+  Cancelled: {
+    key: 'returnsNum',
+    route: '/main/order/5'
+  }
 };
-
-exports.setAccountPageValue = setAccountPageValue;
+exports.orderData = orderData;
 
 var PersonalInfoMobile =
 /** @class */
@@ -258,7 +288,8 @@ function (_super) {
       userInfo: currentUser,
       loading: false,
       selectedImgFile: {},
-      editImgModalVisible: false
+      editImgModalVisible: false,
+      orderStatus: getAccountPageValue('orderStatus') || {}
     };
 
     _this.getNum = function (v) {
@@ -309,6 +340,8 @@ function (_super) {
     };
 
     _this.clickName = function () {
+      var LPObj = (0, _storeUtil.getSessionStore)('channelPurchase') || {};
+
       if (!(0, _isEmpty["default"])(LPObj)) {
         return;
       }
@@ -406,7 +439,6 @@ function (_super) {
 
     _this.hideBottomBar = function () {
       var homeNavBar = document.querySelector('.home-navigation');
-      console.log('homeNavBar', homeNavBar);
       if (homeNavBar) homeNavBar.style.visibility = 'hidden';
     };
 
@@ -471,6 +503,57 @@ function (_super) {
       }
     };
 
+    _this.onOrderItemClick = function (v) {
+      var _a;
+
+      if ((0, _commonUtil.checkLogin)(true)) {
+        var routeUrl = (_a = orderData[v]) === null || _a === void 0 ? void 0 : _a.route;
+        var selfUrl = (0, _commonUtil.ensure)(function () {
+          return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
+        }, '');
+        (0, _commonUtil.navigateTo)(routeUrl || selfUrl);
+      }
+    };
+
+    _this.getInit = function () {
+      return __awaiter(_this, void 0, void 0, function () {
+        var orderStatus;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
+            case 0:
+              return [4
+              /*yield*/
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/orders/status/num', {}, 'GET')];
+
+            case 1:
+              orderStatus = _a.sent();
+              this.setState({
+                orderStatus: orderStatus
+              });
+              setAccountPageValue({
+                orderStatus: orderStatus
+              });
+              return [2
+              /*return*/
+              ];
+          }
+        });
+      });
+    };
+
+    _this.getImageHtml = function (item) {
+      var orderStatus = _this.state.orderStatus;
+      var num = (0, _commonUtil.ensure)(function () {
+        return orderStatus[orderData[item.sourceType].key];
+      }, '');
+      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+        data: item.image,
+        maxWidth: "100%"
+      }), num ? /*#__PURE__*/_react["default"].createElement("span", {
+        className: "pot"
+      }, num) : null);
+    };
+
     return _this;
   }
 
@@ -480,6 +563,10 @@ function (_super) {
     }
 
     this.getMessageNum();
+
+    if ((0, _commonUtil.isLogin)()) {
+      this.getInit();
+    }
   };
 
   PersonalInfoMobile.prototype.render = function () {
@@ -491,8 +578,11 @@ function (_super) {
         userInfo = _a.userInfo,
         editImgModalVisible = _a.editImgModalVisible,
         selectedImgFile = _a.selectedImgFile;
+    var LPObj = (0, _storeUtil.getSessionStore)('channelPurchase') || {};
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])('personal-information-mobile')
+      className: (0, _classnames["default"])('personal-information-mobile', {
+        higher: (0, _commonUtil.isLogin)() || (0, _coreUtil.isDesignMode)()
+      })
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "top"
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -541,7 +631,7 @@ function (_super) {
       color: "#fff",
       onClick: this.goSettings,
       size: 24,
-      type: "icon-set"
+      type: "icon-settings"
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "iconWrap"
     }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
@@ -551,7 +641,7 @@ function (_super) {
       type: "icon-messages"
     }), !!messageNum && /*#__PURE__*/_react["default"].createElement("span", {
       className: "num"
-    }, messageNum)))), /*#__PURE__*/_react["default"].createElement("div", {
+    }, messageNum)))), ((0, _commonUtil.isLogin)() || (0, _coreUtil.isDesignMode)()) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "bottom"
     }, data.groupSource.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement("div", {
@@ -577,7 +667,49 @@ function (_super) {
           item.title.text = text;
         }
       })));
-    })), editImgModalVisible && /*#__PURE__*/_react["default"].createElement(_common.CropperModal, {
+    })), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "orders"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "fixed-wrap"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "top"
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: "title"
+    }, (0, _locale.i18n)('ORDERS')), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "btn-wrap"
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: "text",
+      onClick: function onClick() {
+        if ((0, _commonUtil.checkLogin)(true)) (0, _commonUtil.navigateTo)('/main/order/0');
+      }
+    }, (0, _locale.i18n)('VIEW_ALL_ORDERS')), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+      color: "#C7C7C7",
+      size: 13,
+      type: "icon-outlined-right"
+    }))), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "list"
+    }, data.groupSource2.map(function (item) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        key: item.id,
+        className: "item",
+        onClick: function onClick() {
+          return _this.onOrderItemClick(item.sourceType);
+        }
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "content-wrap",
+        style: {
+          pointerEvents: window.magicDesign.mode == 'designer' ? 'auto' : 'none'
+        }
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "img-wrap"
+      }, item.image.open && _this.getImageHtml(item)), item.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+        className: "title",
+        data: item.title,
+        onTextInput: function onTextInput(text) {
+          item.title.text = text;
+        }
+      })));
+    })))), editImgModalVisible && /*#__PURE__*/_react["default"].createElement(_common.CropperModal, {
       onClose: function onClose() {
         _this.setState({
           editImgModalVisible: false

package/lib/composite-comp/dito/components/PersonalInformation/mobile/index.less

@@ -1,7 +1,10 @@
 .personal-information-mobile {
-  height: 3.24rem;
-  padding: 0.32rem;
-  box-sizing: border-box;
+  padding: 0.44rem 0.32rem;
+  box-sizing: content-box;
+  height: 4.18rem;
+}
+.personal-information-mobile.higher {
+  border-bottom: 1.6rem solid #fff;
 }
 .personal-information-mobile .top {
   display: flex;
@@ -45,8 +48,9 @@
   margin: 0;
 }
 .personal-information-mobile .top .pInfoWrap .userInfo .name {
-  font-size: 0.28rem;
-  font-weight: 500;
+  font-family: Montserrat;
+  font-size: 0.32rem;
+  font-weight: 600;
   color: #ffffff;
   max-width: 2.96rem;
   white-space: nowrap;
@@ -55,8 +59,9 @@
   word-break: break-all;
 }
 .personal-information-mobile .top .pInfoWrap .userInfo .phone {
-  font-size: 0.28rem;
-  font-weight: 400;
+  font-family: Montserrat;
+  font-size: 0.32rem;
+  font-weight: 600;
   color: #ffffff;
   margin-top: 0.1rem;
 }
@@ -70,8 +75,8 @@
   border-radius: 50%;
 }
 .personal-information-mobile .top .pInfoWrap .btnLogin {
-  font-size: 0.28rem;
-  font-weight: 400;
+  font-size: 0.32rem;
+  font-weight: 600;
   color: #ffffff;
   font-family: Montserrat;
 }
@@ -140,3 +145,89 @@
   line-height: 0.32rem;
   text-align: center;
 }
+.personal-information-mobile .orders {
+  margin-top: 0.48rem;
+}
+.personal-information-mobile .orders .fixed-wrap {
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+  box-shadow: 0 0.06rem 0.12rem rgba(0, 0, 0, 0.16);
+  border-radius: 0.32rem;
+  width: auto;
+  padding: 0.32rem;
+}
+.personal-information-mobile .orders .fixed-wrap .top {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  font-weight: 600;
+  line-height: 0.36rem;
+  color: var(--font-color);
+}
+.personal-information-mobile .orders .fixed-wrap .top .title {
+  font-size: 0.28rem;
+  font-weight: 600;
+  color: #2C2C2C;
+}
+.personal-information-mobile .orders .fixed-wrap .top .btn-wrap {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+}
+.personal-information-mobile .orders .fixed-wrap .top .btn-wrap .text {
+  font-size: 0.28rem;
+  color: #929292;
+  font-weight: 400;
+  margin-right: 0.08rem;
+}
+.personal-information-mobile .orders .fixed-wrap .list {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  height: 1.32rem;
+  margin-top: 0.48rem;
+  margin-bottom: 0.02rem;
+}
+.personal-information-mobile .orders .fixed-wrap .list .item {
+  display: flex;
+  flex: 1 1;
+}
+.personal-information-mobile .orders .fixed-wrap .list .item .content-wrap {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.personal-information-mobile .orders .fixed-wrap .list .item .img-wrap {
+  position: relative;
+  display: flex;
+  margin-bottom: 0.16rem;
+  width: 0.72rem;
+  height: 0.72rem;
+}
+.personal-information-mobile .orders .fixed-wrap .list .item .img-wrap .pot {
+  display: inline-block;
+  padding: 0 0.08rem;
+  background: #ce1126;
+  border: 0.02rem solid #ce1126;
+  font-size: 0.16rem;
+  text-align: center;
+  color: #fff;
+  position: absolute;
+  top: -0.04rem;
+  left: 0.4rem;
+  min-width: 0.32rem;
+  height: 0.32rem;
+  border-radius: 50%;
+  line-height: 0.3rem;
+}
+.personal-information-mobile .orders .fixed-wrap .list .item .title {
+  height: 0.44rem;
+  font-size: 0.24rem;
+  line-height: 0.22rem;
+  color: #2C2C2C;
+  text-align: center;
+}

package/lib/composite-comp/dito/config-panels/{OrdersConfig/ConfigGroup → PersonalInformationConfig/OrdersConfigGroup}/index.js

@@ -13,9 +13,9 @@ var _GroupList = _interopRequireDefault(require("../../../../../common/GroupList
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 
-var _Button = _interopRequireDefault(require("../../../../../common/Button"));
+var _defaultJSON = require("../../../components/PersonalInformation/defaultJSON");
 
-var _defaultJSON = require("../../../components/Orders/defaultJSON");
+var _Button = _interopRequireDefault(require("../../../../../common/Button"));
 
 var _locale = require("../../../../../locale");
 

package/lib/composite-comp/dito/config-panels/PersonalInformationConfig/index.js

@@ -7,10 +7,12 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _ConfigGroup = _interopRequireDefault(require("./ConfigGroup"));
+var _PersonInfoConfigGroup = _interopRequireDefault(require("./PersonInfoConfigGroup"));
 
 var _ConfigDecoration = _interopRequireDefault(require("./ConfigDecoration"));
 
+var _OrdersConfigGroup = _interopRequireDefault(require("./OrdersConfigGroup"));
+
 var _locale = require("../../../../locale");
 
 var _common = require("../../../../common");
@@ -94,20 +96,28 @@ function (_super) {
         })
       }, {
         key: 'PersonalInformation3',
-        name: (0, _locale.i18n)('Content'),
-        value: /*#__PURE__*/_react["default"].createElement(_ConfigGroup["default"], {
+        name: (0, _locale.i18n)('CONTENT'),
+        value: /*#__PURE__*/_react["default"].createElement(_PersonInfoConfigGroup["default"], {
           maxNum: 4,
           source: data.groupSource
         }),
         metaOption: data.groupSource
       }, {
         key: 'PersonalInformation4',
+        name: (0, _locale.i18n)('ORDERS'),
+        value: /*#__PURE__*/_react["default"].createElement(_OrdersConfigGroup["default"], {
+          maxNum: 5,
+          source: data.groupSource2
+        }),
+        metaOption: data.groupSource2
+      }, {
+        key: 'PersonalInformation5',
         name: (0, _locale.i18n)('SPACING'),
         value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
           data: data.spacing
         })
       }, {
-        key: 'PersonalInformation5',
+        key: 'PersonalInformation6',
         name: (0, _locale.i18n)('BACKGROUND'),
         value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
           data: data.background