@fonixtree/magic-design 2.0.207 → 2.0.209

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

@@ -0,0 +1,210 @@
+.personal-information-second-mobile {
+  padding: 0.32rem 0.32rem;
+  box-sizing: border-box;
+}
+.personal-information-second-mobile .top {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.personal-information-second-mobile .top .pInfoWrap {
+  display: flex;
+  align-items: center;
+}
+.personal-information-second-mobile .top .pInfoWrap .photoWrap {
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
+  margin-right: 0.32rem;
+  height: 0.76rem;
+  width: 0.76rem;
+}
+.personal-information-second-mobile .top .pInfoWrap .photoWrap > input {
+  position: absolute;
+  z-index: 3;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  opacity: 0;
+}
+.personal-information-second-mobile .top .pInfoWrap .photoWrap .decorationIcon {
+  position: absolute;
+  z-index: 1;
+  width: 1.2rem;
+  height: 1.2rem;
+  left: -0.22rem;
+  top: -0.22rem;
+}
+.personal-information-second-mobile .top .pInfoWrap .userInfo {
+  display: inline-block;
+  vertical-align: middle;
+}
+.personal-information-second-mobile .top .pInfoWrap .userInfo p {
+  margin: 0;
+}
+.personal-information-second-mobile .top .pInfoWrap .userInfo .name {
+  font-family: Montserrat;
+  font-size: 0.28rem;
+  font-weight: 600;
+  color: #3E3E3E;
+  max-width: 2.96rem;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  word-break: break-all;
+}
+.personal-information-second-mobile .top .pInfoWrap .userInfo .wishlist,
+.personal-information-second-mobile .top .pInfoWrap .userInfo .following {
+  color: #3E3E3E;
+  font-family: Montserrat;
+  font-size: 0.16rem;
+  font-style: normal;
+  font-weight: 600;
+  line-height: 0.36rem;
+}
+.personal-information-second-mobile .top .pInfoWrap .userInfo .wishlist span,
+.personal-information-second-mobile .top .pInfoWrap .userInfo .following span {
+  font-size: 0.2rem;
+}
+.personal-information-second-mobile .top .pInfoWrap .userInfo .wishlist {
+  margin-right: 0.16rem;
+}
+.personal-information-second-mobile .top .pInfoWrap .userInfo .following {
+  margin-left: 0.16rem;
+}
+.personal-information-second-mobile .top .pInfoWrap .photo {
+  display: inline-block;
+  width: 0.76rem;
+  height: 0.76rem;
+  line-height: 1.2rem;
+  text-align: center;
+  border-radius: 50%;
+}
+.personal-information-second-mobile .top .pInfoWrap .edit-icon {
+  position: absolute;
+  z-index: 2;
+  bottom: 0;
+  right: 0;
+  width: 0.3rem;
+  height: 0.3rem;
+}
+.personal-information-second-mobile .top .pInfoWrap .btnLogin {
+  font-size: 0.32rem;
+  font-weight: 600;
+  color: #3E3E3E;
+  font-family: Montserrat;
+}
+.personal-information-second-mobile .top .btnGroup {
+  display: flex;
+  align-items: center;
+}
+.personal-information-second-mobile .top .btnGroup .iconWrap {
+  display: inline-block;
+  margin-left: 0.3rem;
+  position: relative;
+  display: inline-flex;
+  align-items: center;
+}
+.personal-information-second-mobile .top .btnGroup .num {
+  position: absolute;
+  top: -0.04rem;
+  left: 0.28rem;
+  display: inline-block;
+  padding: 0 0.08rem;
+  border-radius: 50%;
+  text-align: center;
+  min-width: 0.32rem;
+  height: 0.32rem;
+  line-height: 0.32rem;
+  background: #ce1126;
+  font-size: 0.12rem;
+  color: #ffffff;
+}
+.personal-information-second-mobile .orders {
+  margin-top: 0.32rem;
+}
+.personal-information-second-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.24rem 0.32rem;
+}
+.personal-information-second-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-second-mobile .orders .fixed-wrap .top .title {
+  font-size: 0.28rem;
+  font-weight: 700;
+  color: #3E3E3E;
+}
+.personal-information-second-mobile .orders .fixed-wrap .top .btn-wrap {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+}
+.personal-information-second-mobile .orders .fixed-wrap .top .btn-wrap .text {
+  font-size: 0.2rem;
+  color: #0038A7;
+  font-weight: 600;
+  margin-right: 0.08rem;
+}
+.personal-information-second-mobile .orders .fixed-wrap .list {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  height: 1.04rem;
+  margin-top: 0.36rem;
+  margin-bottom: 0.02rem;
+}
+.personal-information-second-mobile .orders .fixed-wrap .list .item {
+  display: flex;
+  flex: 1 1;
+}
+.personal-information-second-mobile .orders .fixed-wrap .list .item .content-wrap {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.personal-information-second-mobile .orders .fixed-wrap .list .item .img-wrap {
+  position: relative;
+  display: flex;
+  margin-bottom: 0.16rem;
+  width: 0.72rem;
+  height: 0.72rem;
+}
+.personal-information-second-mobile .orders .fixed-wrap .list .item .img-wrap .pot {
+  display: inline-block;
+  padding: 0 0.08rem;
+  background: #3360B9;
+  border: 0.02rem solid #fff;
+  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.28rem;
+}
+.personal-information-second-mobile .orders .fixed-wrap .list .item .title {
+  height: 0.44rem;
+  font-size: 0.2rem;
+  font-weight: 600;
+  line-height: 0.22rem;
+  color: #3E3E3E;
+  text-align: center;
+}

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

@@ -416,6 +416,7 @@ function (_super) {
                   return {
                     type: 'ad',
                     url: it === null || it === void 0 ? void 0 : it.url,
+                    id: it === null || it === void 0 ? void 0 : it.contentId,
                     adObj: it
                   };
                 })];
@@ -592,6 +593,11 @@ function (_super) {
           _this.getMacy(".macyContainer_" + _this.props.panelProps.id, LAYOUT_COLUMN[layout]);
         }
       });
+      setTimeout(function () {
+        if (document.querySelector(".macyContainer_" + _this.props.panelProps.id)) {
+          _this.getMacy(".macyContainer_" + _this.props.panelProps.id, LAYOUT_COLUMN[layout]);
+        }
+      }, 3000);
     };
 
     _this.getMacy = function (container, columns) {

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

@@ -78,6 +78,10 @@ var getDefaultJSON = function getDefaultJSON() {
         backgroundColor: {
           pc: 'transparent',
           mobile: 'transparent'
+        },
+        iconColor: {
+          pc: '#fff',
+          mobile: '#fff'
         }
       },
       keyword: {

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

@@ -180,9 +180,10 @@ function (_super) {
         backgroundColor: (_h = (_g = data.content.box) === null || _g === void 0 ? void 0 : _g.backgroundColor) === null || _h === void 0 ? void 0 : _h.mobile
       }
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: (_k = (_j = data.content.box) === null || _j === void 0 ? void 0 : _j.color) === null || _k === void 0 ? void 0 : _k.mobile,
-      size: (0, _commonUtil.convertToRem)(24),
-      type: "icon-search2"
+      bold: true,
+      color: (_k = (_j = data.content.box) === null || _j === void 0 ? void 0 : _j.iconColor) === null || _k === void 0 ? void 0 : _k.mobile,
+      size: (0, _commonUtil.convertToRem)(20),
+      type: "icon-search-short"
     }), /*#__PURE__*/_react["default"].createElement(_antd.Input, {
       className: "search-input",
       onBlur: this.onBlur,
@@ -195,13 +196,25 @@ function (_super) {
       value: value
     })), data.content && ((_l = data.content.cartIcon) === null || _l === void 0 ? void 0 : _l.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       className: "right-icon",
-      data: data.content.cartIcon
+      data: data.content.cartIcon,
+      style: {
+        width: '25px',
+        height: '25px'
+      }
     }), data.content && ((_m = data.content.chatbotIcon) === null || _m === void 0 ? void 0 : _m.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       className: "right-icon",
-      data: data.content.chatbotIcon
+      data: data.content.chatbotIcon,
+      style: {
+        width: '32px',
+        height: '32px'
+      }
     }), data.content && ((_o = data.content.messageIcon) === null || _o === void 0 ? void 0 : _o.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       className: "right-icon",
-      data: data.content.messageIcon
+      data: data.content.messageIcon,
+      style: {
+        width: '25px',
+        height: '25px'
+      }
     })), data.content && ((_p = data.content.logo) === null || _p === void 0 ? void 0 : _p.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "logo",
       onClick: function onClick() {
@@ -219,7 +232,7 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       data: data.content.logo,
       style: {
-        height: 20
+        height: 23
       }
     }))), /*#__PURE__*/_react["default"].createElement(_antd.Carousel, {
       ref: this.carouselRef,

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

@@ -24,8 +24,8 @@
   background: transparent;
   border-radius: 0.4rem;
   border: 0.02rem solid #fff;
-  padding: 0.08rem 0.2rem;
-  height: 0.56rem;
+  padding: 0.08rem 0.2rem 0.08rem 0.08rem;
+  height: 0.54rem;
   text-align: right;
   display: flex;
   justify-content: space-between;
@@ -46,8 +46,6 @@
 .m-search-banner-mobile .search-bar .right .right-icon {
   margin-left: 0.2rem;
   display: inline-block;
-  width: 0.5rem;
-  height: 0.5rem;
 }
 .m-search-banner-mobile .search-bar .logo {
   margin-right: 0.3rem;

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

@@ -66,13 +66,7 @@ var groupSourceJSON = function groupSourceJSON(parentId) {
       },
       vertical: {}
     },
-    clickUrl: '',
-    background: {
-      opacity: 100,
-      color: '#fff',
-      image: '',
-      bgType: 'image'
-    }
+    clickUrl: ''
   };
 };
 
@@ -83,27 +77,27 @@ var getDefaultJSON = function getDefaultJSON() {
   return {
     id: groupId,
     type: 'SLIDE_IMAGE',
-    content: {
-      moveIcon: {
-        id: (0, _uuid.v4)(),
-        open: true,
-        type: 'IMAGE',
-        content: {
-          h5Name: 'Image Name',
-          pcName: 'Image Name',
-          h5ImgSrc: '',
-          pcImgSrc: '',
-          clickUrl: ''
-        },
-        hover: {
-          open: false,
-          backgroundType: 'enlarge',
-          magnification: 1.5,
-          pcImgHoverUrl: '',
-          h5ImgHoverUrl: ''
-        }
-      }
-    },
+    // content: {
+    //   moveIcon: {
+    //     id: uuidv4(),
+    //     open: true,
+    //     type: 'IMAGE',
+    //     content: {
+    //       h5Name: 'Image Name',
+    //       pcName: 'Image Name',
+    //       h5ImgSrc: '',
+    //       pcImgSrc: '',
+    //       clickUrl: '',
+    //     },
+    //     hover: {
+    //       open: false,
+    //       backgroundType: 'enlarge',
+    //       magnification: 1.5,
+    //       pcImgHoverUrl: '',
+    //       h5ImgHoverUrl: '',
+    //     },
+    //   },
+    // },
     groupSource: [groupSourceJSON(groupId), groupSourceJSON(groupId), groupSourceJSON(groupId)],
     spacing: {
       pc: {

package/lib/composite-comp/dito/components/SlideImage/pc/components/VideoItem/index.js

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _commonUtil = require("../../../../../../../utils/commonUtil");
+
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -45,14 +47,15 @@ function (_super) {
   __extends(VideoItem, _super);
 
   function VideoItem() {
-    var _this = _super !== null && _super.apply(this, arguments) || this;
+    var _a;
+
+    var _this = _super.apply(this, arguments) || this;
 
     _this.state = {
-      playing: false,
+      playing: !!(((_a = _this.props.data.video) === null || _a === void 0 ? void 0 : _a.sourceUrl) && (0, _commonUtil.isPad)()),
       videoPoster: ''
     };
     _this.videoRef = /*#__PURE__*/_react["default"].createRef();
-    _this.cardRef = /*#__PURE__*/_react["default"].createRef();
     _this.canvasRef = /*#__PURE__*/_react["default"].createRef();
 
     _this.onMouseEnter = function () {
@@ -85,11 +88,11 @@ function (_super) {
   VideoItem.prototype.componentDidMount = function () {
     var _this = this;
 
-    var dom = this.cardRef.current;
-    dom.addEventListener('mousemove', this.handleMouseMove);
-    dom.addEventListener('mouseleave', this.handleMouseLeave);
+    if (this.videoRef.current && (0, _commonUtil.isPad)()) {
+      this.videoRef.current.autoplay = true;
+    }
 
-    if (this.videoRef.current) {
+    if (this.videoRef.current && !(0, _commonUtil.isPad)()) {
       var video_1 = this.videoRef.current;
       var canvas_1 = this.canvasRef.current;
       video_1.addEventListener('loadedmetadata', function () {
@@ -111,13 +114,9 @@ function (_super) {
     }
   };
 
-  VideoItem.prototype.componentWillUnmount = function () {
-    var dom = this.cardRef.current;
-    dom.removeEventListener('mousemove', this.handleMouseMove);
-    dom.removeEventListener('mouseleave', this.handleMouseLeave);
-  };
-
   VideoItem.prototype.render = function () {
+    var _this = this;
+
     var _a, _b, _c, _d, _e, _f, _g, _h;
 
     var _j = this.props,
@@ -130,10 +129,17 @@ function (_super) {
         videoPoster = _k.videoPoster;
     var img = ((_b = (_a = data.overilay) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.pcImgSrc) || videoPoster;
     return /*#__PURE__*/_react["default"].createElement("div", {
-      ref: this.cardRef,
       className: "slide-image-video-wrap",
-      onMouseEnter: this.onMouseEnter,
-      onMouseLeave: this.onMouseLeave,
+      onMouseEnter: function onMouseEnter() {
+        if (!(0, _commonUtil.isPad)()) {
+          _this.onMouseEnter();
+        }
+      },
+      onMouseLeave: function onMouseLeave() {
+        if (!(0, _commonUtil.isPad)()) {
+          _this.onMouseLeave();
+        }
+      },
       style: {
         cursor: cursor && (moveIcon === null || moveIcon === void 0 ? void 0 : moveIcon.open) ? "url('" + ((_c = moveIcon === null || moveIcon === void 0 ? void 0 : moveIcon.content) === null || _c === void 0 ? void 0 : _c.pcImgSrc) + "'), pointer" : 'unset'
       }

package/lib/composite-comp/dito/components/SlideImage/pc/components/VideoItem/index.less

@@ -1,9 +1,6 @@
 .slide-image-video-wrap {
   position: relative;
-  display: flex;
   border-radius: 16px;
-  --dx: calc(var(--size) - var(--x));
-  --dy: calc(var(--size) - var(--y));
 
   &:hover {
     box-shadow: 0px 12px 48px 0px #00000029;
@@ -35,12 +32,14 @@
   video {
     width: 100%;
     border-radius: 16px;
+    vertical-align: middle;
   }
 
   .video-img {
     width: 100%;
     border-radius: 16px;
     background: #fff;
+    vertical-align: middle;
 
     &.cover {
       position: absolute;

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

@@ -0,0 +1,91 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _common = require("../../../../../common");
+
+require("./index.less");
+
+var _coreUtil = require("../../../../../utils/coreUtil");
+
+var _ImageConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/ImageConfig"));
+
+var _locale = require("../../../../../locale");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var ConfigDecoration =
+/** @class */
+function (_super) {
+  __extends(ConfigDecoration, _super);
+
+  function ConfigDecoration() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.reRender = function () {
+      (0, _coreUtil.renderPreview)();
+
+      _this.setState({});
+    };
+
+    return _this;
+  }
+
+  ConfigDecoration.prototype.render = function () {
+    var data = this.props.data;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "config_decoration"
+    }, /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
+      headerSize: "middle",
+      onRefresh: this.reRender,
+      source: [{
+        key: data.id,
+        name: (0, _locale.i18n)('FESTIVAL_DECORATION'),
+        value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
+          data: data
+        }),
+        metaOption: data
+      }],
+      type: "switch"
+    }));
+  };
+
+  ConfigDecoration.defaultProps = {
+    data: {}
+  };
+  return ConfigDecoration;
+}(_react["default"].Component);
+
+var _default = ConfigDecoration;
+exports["default"] = _default;

package/lib/composite-comp/dito/config-panels/PersonalInformationSecondConfig/ConfigDecoration/index.less

@@ -0,0 +1,9 @@
+.carousel_setting {
+
+  .collapse_wrap {
+    .header_wrap {
+      font-weight: 600 !important;
+    }
+  }
+
+}