@fonixtree/magic-design 2.0.83 → 2.0.85

package/es/constants/index.js

@@ -46,17 +46,17 @@ var walletType = {
 };
 exports.walletType = walletType;
 var orderStatusType = {
-  PAY: 'To pay',
+  PAY: 'To Pay',
   SHIP: 'To Ship',
   RECEIVE: 'To Receive',
-  RATING: 'Rating',
-  RETURN: 'Return'
+  DONE: 'Done',
+  CANCELLED: 'Cancelled'
 };
 exports.orderStatusType = orderStatusType;
 var personalInfoType = {
   WISHLIST: 'Wishlist',
   STORES: 'Stores',
-  COUPONS: 'Coupons',
+  VOUCHERS: 'Vouchers',
   VIEWED: 'Recently Viewed'
 };
 exports.personalInfoType = personalInfoType;
@@ -212,7 +212,7 @@ var compInfoMap = {
     name: 'Menu Navigation',
     icon: 'icon-footer'
   },
-  PERSONAL_INFORMATION: {
+  PERSONAL_INFOMATION: {
     name: 'Personal Information',
     icon: 'icon-account'
   },

package/es/core/Designer/ConfigPanel/index.js

@@ -131,7 +131,7 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
       groupName = panelProps.button.text;
       break;
 
-    case 'PERSONAL_INFORMATION':
+    case 'PERSONAL_INFOMATION':
     case 'ORDERS':
       groupName = panelProps.sourceType;
       break;

package/es/locale/en/en.json

@@ -1,13 +1,13 @@
 {
-  "RETURN": "Return",
-  "RATING": "Rating",
+  "CANCELLED": "Cancelled",
+  "DONE": "Done",
   "TO_RECEIVE": "To Receive",
   "TO_SHIP": "To ship",
-  "TO_PAY": "To pay",
+  "TO_PAY": "To Pay",
   "VIEW_ALL_ORDERS": "View All Orders",
-  "ORDERS": "ORDERS",
+  "ORDERS": "Orders",
   "RECENTLY_VIEWED": "Recently Viewed",
-  "COUPONS": "Coupons",
+  "VOUCHERS": "Vouchers",
   "STORES": "Stores",
   "WISHLIST": "Wishlist",
   "IMAGE_NAME_IS_TOO_LONG": "Image name is too long",

package/es/locale/es/es.json

@@ -1,13 +1,13 @@
 {
-  "RETURN": "Return",
-  "RATING": "Rating",
+  "CANCELLED": "Cancelled",
+  "DONE": "Done",
   "TO_RECEIVE": "To Receive",
   "TO_SHIP": "To ship",
-  "TO_PAY": "To pay",
+  "TO_PAY": "To Pay",
   "VIEW_ALL_ORDERS": "View All Orders",
-  "ORDERS": "ORDERS",
+  "ORDERS": "Orders",
   "RECENTLY_VIEWED": "Recently Viewed",
-  "COUPONS": "Coupons",
+  "VOUCHERS": "Vouchers",
   "STORES": "Stores",
   "WISHLIST": "Wishlist",
   "IMAGE_NAME_IS_TOO_LONG": "Image name is too long",

package/es/locale/id/id.json

@@ -1,13 +1,13 @@
 {
-  "RETURN": "Return",
-  "RATING": "Rating",
+  "CANCELLED": "Cancelled",
+  "DONE": "Done",
   "TO_RECEIVE": "To Receive",
   "TO_SHIP": "To ship",
-  "TO_PAY": "To pay",
+  "TO_PAY": "To Pay",
   "VIEW_ALL_ORDERS": "View All Orders",
-  "ORDERS": "ORDERS",
+  "ORDERS": "Orders",
   "RECENTLY_VIEWED": "Recently Viewed",
-  "COUPONS": "Coupons",
+  "VOUCHERS": "Vouchers",
   "STORES": "Stores",
   "WISHLIST": "Wishlist",
   "IMAGE_NAME_IS_TOO_LONG": "Image name is too long",

package/es/utils/commonUtil.js

@@ -752,7 +752,7 @@ function pushGA(data, eventName) {
         elementName: data.elementName
       };
       console.log('GA push', eventName, eventData);
-      window.gtag('event', eventName, eventData);
+      if (window.gtag) window.gtag('event', eventName, eventData);
     }
   } catch (error) {
     console.error(error);

package/lib/common/GroupList/index.js

@@ -121,6 +121,8 @@ function (_super) {
       _this.setState({});
 
       (0, _coreUtil.renderPreview)();
+
+      _this.props.reRender();
     };
 
     _this.deleteItem = function (e, item) {

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

@@ -7,7 +7,7 @@ exports.getDefaultJSON = exports.CommonFunctionsGroupSourceJSON = void 0;
 
 var _uuid = require("uuid");
 
-var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON() {
+var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON(text, url) {
   var groupId = (0, _uuid.v4)();
   return {
     id: groupId,
@@ -17,7 +17,7 @@ var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON() {
       open: true,
       type: 'TEXT',
       specialContent: [],
-      text: 'Function Name',
+      text: text || 'Chat With Us',
       content: {
         sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
@@ -25,7 +25,11 @@ var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON() {
         fontSize: 14,
         color: '#2C2C2C',
         width: 0,
-        textAlign: 'center'
+        textAlign: 'center',
+        clickUrl: {
+          name: url,
+          value: url
+        }
       },
       underline: {
         open: false,
@@ -63,7 +67,7 @@ var getDefaultJSON = function getDefaultJSON() {
   return {
     id: (0, _uuid.v4)(),
     type: 'COMMON_FUNCTIONS',
-    groupSource: [CommonFunctionsGroupSourceJSON()],
+    groupSource: [CommonFunctionsGroupSourceJSON('Address', '/address/manage'), CommonFunctionsGroupSourceJSON('Policies', '/account/policies'), CommonFunctionsGroupSourceJSON('Security Center', '/account/security'), CommonFunctionsGroupSourceJSON('Chat With Us')],
     spacing: {
       pc: {
         paddingTop: 0,

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

@@ -56,10 +56,12 @@ function (_super) {
     _this.state = {};
 
     _this.onItemClick = function (item) {
-      var url = (0, _commonUtil.ensure)(function () {
-        return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
-      }, '');
-      (0, _commonUtil.navigateTo)(url);
+      if ((0, _commonUtil.checkLogin)()) {
+        var url = (0, _commonUtil.ensure)(function () {
+          return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
+        }, '');
+        (0, _commonUtil.navigateTo)(url);
+      }
     };
 
     return _this;

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

@@ -1,7 +1,5 @@
 .common-functions-mobile {
-  background: #ffffff;
-  padding-top: 1.7rem;
-  height: calc(100vh - 6.36rem);
+  padding: 0.32rem 0;
   box-sizing: border-box;
   overflow: auto;
 }
@@ -12,7 +10,6 @@
 .common-functions-mobile ul li {
   padding: 0.24rem 0.32rem;
   box-sizing: border-box;
-  background: #ffffff;
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -24,7 +21,7 @@
 .common-functions-mobile ul li > div .img {
   width: 0.32rem;
   height: 0.32rem;
-  margin-right: 0.24rem;
+  margin-right: 0.08rem;
 }
 .common-functions-mobile ul li > div .title {
   font-size: 0.28rem;

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

@@ -7,7 +7,7 @@ exports.getDefaultJSON = exports.OrdersGroupSourceJSON = void 0;
 
 var _uuid = require("uuid");
 
-var OrdersGroupSourceJSON = function OrdersGroupSourceJSON() {
+var OrdersGroupSourceJSON = function OrdersGroupSourceJSON(text) {
   var groupId = (0, _uuid.v4)();
   return {
     id: groupId,
@@ -17,7 +17,7 @@ var OrdersGroupSourceJSON = function OrdersGroupSourceJSON() {
       open: true,
       type: 'TEXT',
       specialContent: [],
-      text: 'To pay',
+      text: text || 'Name',
       content: {
         sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
@@ -54,7 +54,7 @@ var OrdersGroupSourceJSON = function OrdersGroupSourceJSON() {
         h5ImgHoverUrl: ''
       }
     },
-    sourceType: 'To pay'
+    sourceType: text
   };
 };
 
@@ -64,7 +64,7 @@ var getDefaultJSON = function getDefaultJSON() {
   return {
     id: (0, _uuid.v4)(),
     type: 'ORDERS',
-    groupSource: [OrdersGroupSourceJSON()],
+    groupSource: [OrdersGroupSourceJSON('To Pay'), OrdersGroupSourceJSON('To Ship'), OrdersGroupSourceJSON('To Receive'), OrdersGroupSourceJSON('Done'), OrdersGroupSourceJSON('Cancelled')],
     spacing: {
       pc: {
         paddingTop: 0,

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

@@ -198,7 +198,7 @@ var getAccountPageValue = function getAccountPageValue(key) {
 };
 
 var orderData = {
-  'To pay': {
+  'To Pay': {
     key: 'toPayNum',
     route: '/main/order/1'
   },
@@ -210,11 +210,11 @@ var orderData = {
     key: 'toReceiveNum',
     route: '/main/order/3'
   },
-  Rating: {
+  Done: {
     key: 'toRatingNum',
     route: '/rating-list'
   },
-  Return: {
+  Cancelled: {
     key: 'returnsNum',
     route: '/aftersale-list'
   }
@@ -234,8 +234,13 @@ function (_super) {
     };
 
     _this.onItemClick = function (v) {
-      var url = orderData[v].route;
-      (0, _commonUtil.navigateTo)(url);
+      var _a;
+
+      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 () {
@@ -266,7 +271,9 @@ function (_super) {
 
     _this.getImageHtml = function (item) {
       var orderStatus = _this.state.orderStatus;
-      var num = orderStatus[orderData[item.sourceType].key];
+      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%"
@@ -290,6 +297,8 @@ function (_super) {
     var data = this.props.data;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('orders-mobile')
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "fixed-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "top"
     }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -319,9 +328,11 @@ function (_super) {
       }, item.image.open && _this.getImageHtml(item)), item.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         className: "title",
         data: item.title,
-        readonly: true
+        onTextInput: function onTextInput(text) {
+          item.title.text = text;
+        }
       }));
-    })));
+    }))));
   };
 
   OrdersMobile.defaultProps = {

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

@@ -1,4 +1,7 @@
 .orders-mobile {
+  height: 1.4rem;
+}
+.orders-mobile .fixed-wrap {
   display: flex;
   flex-direction: column;
   background-color: #fff;
@@ -12,7 +15,7 @@
   top: -1.4rem;
   padding: 0.32rem;
 }
-.orders-mobile .top {
+.orders-mobile .fixed-wrap .top {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
@@ -20,45 +23,46 @@
   line-height: 0.36rem;
   color: var(--font-color);
 }
-.orders-mobile .top .title {
+.orders-mobile .fixed-wrap .top .title {
   font-size: 0.28rem;
   font-weight: 600;
   color: #2C2C2C;
 }
-.orders-mobile .top .btn-wrap {
+.orders-mobile .fixed-wrap .top .btn-wrap {
   display: flex;
   flex-direction: row;
   justify-content: center;
   align-items: center;
 }
-.orders-mobile .top .btn-wrap .text {
+.orders-mobile .fixed-wrap .top .btn-wrap .text {
   font-size: 0.28rem;
   color: #929292;
   font-weight: 400;
   margin-right: 0.08rem;
 }
-.orders-mobile .list {
+.orders-mobile .fixed-wrap .list {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
+  height: 1.32rem;
   margin-top: 0.48rem;
   margin-bottom: 0.02rem;
 }
-.orders-mobile .list .item {
+.orders-mobile .fixed-wrap .list .item {
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
   flex: 1;
 }
-.orders-mobile .list .item .img-wrap {
+.orders-mobile .fixed-wrap .list .item .img-wrap {
   position: relative;
   display: flex;
   margin-bottom: 0.16rem;
   width: 0.72rem;
   height: 0.72rem;
 }
-.orders-mobile .list .item .img-wrap .pot {
+.orders-mobile .fixed-wrap .list .item .img-wrap .pot {
   display: inline-block;
   padding: 0 0.08rem;
   background: #ce1126;
@@ -74,7 +78,7 @@
   border-radius: 50%;
   line-height: 0.3rem;
 }
-.orders-mobile .list .item .title {
+.orders-mobile .fixed-wrap .list .item .title {
   height: 0.44rem;
   font-size: 0.24rem;
   line-height: 0.22rem;

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

@@ -7,7 +7,7 @@ exports.getDefaultJSON = exports.PersonalInfoGroupSourceJSON = void 0;
 
 var _uuid = require("uuid");
 
-var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON() {
+var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON(text) {
   var groupId = (0, _uuid.v4)();
   return {
     id: groupId,
@@ -17,7 +17,7 @@ var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON() {
       open: true,
       type: 'TEXT',
       specialContent: [],
-      text: 'Wishlist',
+      text: text || 'Name',
       content: {
         sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
@@ -40,7 +40,7 @@ var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON() {
       open: true,
       type: 'TEXT',
       specialContent: [],
-      text: 'number',
+      text: 0,
       content: {
         sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
@@ -57,7 +57,7 @@ var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON() {
       },
       vertical: {}
     },
-    sourceType: 'Wishlist'
+    sourceType: text
   };
 };
 
@@ -66,11 +66,11 @@ exports.PersonalInfoGroupSourceJSON = PersonalInfoGroupSourceJSON;
 var getDefaultJSON = function getDefaultJSON() {
   return {
     id: (0, _uuid.v4)(),
-    type: 'PERSONAL_INFORMATION',
+    type: 'PERSONAL_INFOMATION',
     login: {
       open: true
     },
-    groupSource: [PersonalInfoGroupSourceJSON()],
+    groupSource: [PersonalInfoGroupSourceJSON('Wishlist'), PersonalInfoGroupSourceJSON('Stores'), PersonalInfoGroupSourceJSON('Vouchers'), PersonalInfoGroupSourceJSON('Recently Viewed')],
     spacing: {
       pc: {
         paddingTop: 0,

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

@@ -74,7 +74,7 @@ function (_super) {
   };
 
   PersonalInformation.defaultProps = {};
-  PersonalInformation.type = 'PERSONAL_INFORMATION';
+  PersonalInformation.type = 'PERSONAL_INFOMATION';
   PersonalInformation.getDefaultJSON = _defaultJSON.getDefaultJSON;
   PersonalInformation = __decorate([_compositeDecorator["default"]], PersonalInformation);
   return PersonalInformation;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setAccountPageValue = exports["default"] = void 0;
+exports.setAccountPageValue = exports.pInfoData = exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -218,7 +218,23 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
+var pInfoData = {
+  Wishlist: {
+    route: '/favourite/list'
+  },
+  Stores: {
+    route: '/collect-store'
+  },
+  Vouchers: {
+    route: '/my-coupon'
+  },
+  'Recently Viewed': {
+    route: '/review-list'
+  }
+};
+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'));
@@ -237,20 +253,20 @@ function (_super) {
 
     _this.state = {
       messageNum: '',
-      userInfo: {}
+      userInfo: currentUser
     };
 
     _this.getNum = function (v) {
       var userInfo = _this.state.userInfo;
 
       if (v === _index.personalInfoType.WISHLIST) {
-        return userInfo.userCollectionNum || 1;
+        return userInfo.userCollectionNum || 0;
       } else if (v === _index.personalInfoType.STORES) {
-        return userInfo.userCollectionStoreNum || 2;
-      } else if (v === _index.personalInfoType.COUPONS) {
-        return userInfo.couponNum || 3;
+        return userInfo.userCollectionStoreNum || 0;
+      } else if (v === _index.personalInfoType.VOUCHERS) {
+        return userInfo.couponNum || 0;
       } else if (v === _index.personalInfoType.VIEWED) {
-        return userInfo.recentViewNum || 4;
+        return userInfo.recentViewNum || 0;
       }
     };
 
@@ -292,7 +308,7 @@ function (_super) {
     };
 
     _this.goLoginPage = function () {
-      if (browserVersion().isApp) {
+      if ((0, _androidUtil.browserVersion)().isApp) {
         (0, _androidUtil.goToLoginApp)();
       } else {
         (0, _commonUtil.goLogin)();
@@ -349,6 +365,16 @@ function (_super) {
       });
     };
 
+    _this.onItemClick = function (v) {
+      var _a;
+
+      var routeUrl = (_a = pInfoData[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);
+    };
+
     return _this;
   }
 
@@ -424,7 +450,10 @@ function (_super) {
       className: "bottom"
     }, data.groupSource.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement("div", {
-        className: "item"
+        className: "item",
+        onClick: function onClick() {
+          return _this.onItemClick(item.sourceType);
+        }
       }, item.number.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         className: "number",
         data: __assign(__assign({}, item.number), {

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

@@ -3,21 +3,21 @@
   padding: 0.32rem;
   box-sizing: border-box;
 }
-.top {
+.personal-information-mobile .top {
   display: flex;
   justify-content: space-between;
   align-items: start;
 }
-.top .pInfoWrap {
+.personal-information-mobile .top .pInfoWrap {
   display: flex;
   align-items: center;
 }
-.top .pInfoWrap .photoWrap {
+.personal-information-mobile .top .pInfoWrap .photoWrap {
   position: relative;
   display: inline-block;
   vertical-align: middle;
 }
-.top .pInfoWrap .photoWrap > input {
+.personal-information-mobile .top .pInfoWrap .photoWrap > input {
   position: absolute;
   top: 0;
   left: 0;
@@ -25,14 +25,14 @@
   height: 100%;
   opacity: 0;
 }
-.top .pInfoWrap .userInfo {
+.personal-information-mobile .top .pInfoWrap .userInfo {
   display: inline-block;
   vertical-align: middle;
 }
-.top .pInfoWrap .userInfo p {
+.personal-information-mobile .top .pInfoWrap .userInfo p {
   margin: 0;
 }
-.top .pInfoWrap .userInfo .name {
+.personal-information-mobile .top .pInfoWrap .userInfo .name {
   font-size: 0.28rem;
   font-weight: 500;
   color: #ffffff;
@@ -42,13 +42,13 @@
   overflow: hidden;
   word-break: break-all;
 }
-.top .pInfoWrap .userInfo .phone {
+.personal-information-mobile .top .pInfoWrap .userInfo .phone {
   font-size: 0.28rem;
   font-weight: 400;
   color: #ffffff;
   margin-top: 0.1rem;
 }
-.top .pInfoWrap .photo {
+.personal-information-mobile .top .pInfoWrap .photo {
   display: inline-block;
   width: 0.88rem;
   height: 0.88rem;
@@ -58,18 +58,18 @@
   margin-right: 0.3rem;
   border-radius: 50%;
 }
-.top .pInfoWrap .btnLogin {
+.personal-information-mobile .top .pInfoWrap .btnLogin {
   font-size: 0.28rem;
   font-weight: 400;
   color: #ffffff;
   font-family: Montserrat;
 }
-.top .btnGroup .iconWrap {
+.personal-information-mobile .top .btnGroup .iconWrap {
   display: inline-block;
   margin-left: 0.3rem;
   position: relative;
 }
-.top .btnGroup .num {
+.personal-information-mobile .top .btnGroup .num {
   position: absolute;
   top: -0.04rem;
   left: 0.28rem;
@@ -84,14 +84,14 @@
   font-size: 0.12rem;
   color: #ffffff;
 }
-.bottom {
+.personal-information-mobile .bottom {
   display: flex;
   flex-direction: row;
   justify-content: space-around;
   width: 100%;
   margin-top: 0.48rem;
 }
-.bottom .item {
+.personal-information-mobile .bottom .item {
   display: flex;
   flex-direction: column;
   justify-content: flex-start;
@@ -99,7 +99,7 @@
   flex: 1;
   position: relative;
 }
-.bottom .item:after {
+.personal-information-mobile .bottom .item:after {
   content: '';
   display: inline-block;
   width: 0.02rem;
@@ -109,16 +109,18 @@
   top: 0.12rem;
   background: #ccc;
 }
-.bottom .item:last-child:after {
+.personal-information-mobile .bottom .item:last-child:after {
   display: none;
 }
-.bottom .item .number {
+.personal-information-mobile .bottom .item .number {
+  width: 70% !important;
   font-size: 0.36rem;
   font-weight: 600;
   color: #ffffff;
   text-align: center;
 }
-.bottom .item .title {
+.personal-information-mobile .bottom .item .title {
+  width: 70% !important;
   font-size: 0.24rem;
   font-weight: 400;
   color: #ffffff;