@fonixtree/magic-design 1.0.65 → 1.0.67

package/es/composite-comp/bol/components/Video/mobile/Layout2/index.less

@@ -2,39 +2,48 @@
   display: flex;
   flex-direction: column;
   position: relative;
-  padding-bottom: 0.72rem;
-}
-.video-layout2-wrap .slider-wrap {
-  width: 100%;
-  overflow: hidden;
-}
-.video-layout2-wrap .slider-wrap .slider-list-wrap {
-  display: flex;
-  transform: translateX(-100%);
-  transition: all 0.3s linear;
-  position: relative;
-}
-.video-layout2-wrap .slider-wrap .slider-list-wrap.noAnimation {
-  animation: none;
-}
-.video-layout2-wrap .slider-wrap .video-item-wrap {
-  height: 4.24rem;
-  position: relative;
-  width: 100%;
-  flex-shrink: 0;
-}
-.video-layout2-wrap .slider-wrap .video-item-wrap:last-child {
-  margin-bottom: 0;
-}
-.video-layout2-wrap .slider-wrap .video-item-wrap .play-btn {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 1;
-  cursor: pointer;
-}
-.video-layout2-wrap .slider-wrap .video-item-wrap .play-btn img {
-  width: 100%;
-  height: 100%;
-}
+  padding-bottom: 36px;
+
+  .slider-wrap {
+    width: 100%;
+    overflow: hidden;
+
+    .slider-list-wrap {
+      display: flex;
+      transform: translateX(-100%);
+      transition: all .3s linear;
+      position: relative;
+
+      &.noAnimation {
+        animation: none;
+      }
+    }
+
+    .video-item-wrap {
+      height: 212px;
+      position: relative;
+      width: 100%;
+      flex-shrink: 0;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+
+      .play-btn {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        // width: 60px;
+        // height: 60px;
+        z-index: 1;
+        cursor: pointer;
+
+        img {
+          width: 100%;
+          height: 100%;
+        }
+      }
+    }
+  }
+}

package/es/composite-comp/bol/components/Video/mobile/Layout3/index.less

@@ -1,46 +1,57 @@
 .video-layout3-wrap {
   display: flex;
   flex-direction: column;
-}
-.video-layout3-wrap .video-tag-container {
-  padding-top: 0.4rem;
-  padding-bottom: 0.76rem;
-}
-.video-layout3-wrap .video-layout3-item-con {
-  display: flex;
-  flex-direction: column;
-  margin-bottom: 0.2rem;
-}
-.video-layout3-wrap .video-layout3-item-con:last-child {
-  margin-bottom: 0;
-}
-.video-layout3-wrap .video-item-wrap {
-  height: 4.24rem;
-  position: relative;
-}
-.video-layout3-wrap .video-item-wrap:last-child {
-  margin-bottom: 0;
-}
-.video-layout3-wrap .video-item-wrap .play-btn {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 1;
-  cursor: pointer;
-}
-.video-layout3-wrap .video-item-wrap .play-btn img {
-  width: 100%;
-  height: 100%;
-}
-.video-layout3-wrap .video-item-wrap .play-btn.bottomLeft {
-  left: 0.24rem;
-  bottom: 0.2rem;
-  transform: unset;
-  top: unset;
-}
-.video-layout3-wrap .video-item-wrap .video-share-btn {
-  position: absolute;
-  right: 0.24rem;
-  bottom: 0.24rem;
-}
+  .video-tag-container {
+    padding-top: 20px;
+    padding-bottom: 38px;
+  }
+
+  .video-layout3-item-con {
+    display: flex;
+    flex-direction: column;
+    margin-bottom: 10px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  .video-item-wrap {
+    height: 212px;
+    position: relative;
+
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    .play-btn {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      // width: 60px;
+      // height: 60px;
+      z-index: 1;
+      cursor: pointer;
+
+      img {
+        width: 100%;
+        height: 100%;
+      }
+
+      &.bottomLeft {
+        left: 12px;
+        bottom: 10px;
+        transform: unset;
+        top: unset;
+      }
+    }
+
+    .video-share-btn {
+      position: absolute;
+      right: 12px;
+      bottom: 12px;
+    }
+  }
+}

package/es/composite-comp/bol/components/Video/mobile/index.less

@@ -1,3 +1,4 @@
 .m-video-mobile {
-  position: relative;
-}
+	position: relative;
+
+}

package/es/composite-comp/bol/components/Wallet/defaultJSON.js

@@ -12,40 +12,39 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON(parentId) {
   return {
     id: groupId,
     parentId: parentId,
-    title: {
+    image: {
       parentId: groupId,
       id: (0, _uuid.v4)(),
       open: true,
-      type: 'TEXT',
-      specialContent: [],
-      text: 'Cashback',
+      type: 'IMAGE',
       content: {
-        sizeType: 'Customize font styles',
-        fontFamily: 'Open Sans',
-        fontWeight: 700,
-        fontSize: 18,
-        color: '#fff',
-        textAlign: 'center'
+        h5Name: 'Group Name',
+        pcName: 'Group Name',
+        h5ImgSrc: '',
+        pcImgSrc: '',
+        clickUrl: ''
       },
-      underline: {
+      hover: {
         open: false,
-        textDecorationColor: '',
-        textDecorationStyle: 'solid'
-      },
-      vertical: {}
+        backgroundType: 'enlarge',
+        magnification: 1.5,
+        pcImgHoverUrl: '',
+        h5ImgHoverUrl: ''
+      }
     },
-    amount: {
+    title: {
       parentId: groupId,
       id: (0, _uuid.v4)(),
       open: true,
       type: 'TEXT',
       specialContent: [],
-      text: 'RM1000',
+      text: 'Cashback',
       content: {
         sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
-        fontWeight: 700,
-        fontSize: 38,
+        fontWeight: 400,
+        fontSize: 14,
+        pcFontSize: 20,
         color: '#fff',
         textAlign: 'center'
       },
@@ -56,19 +55,19 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON(parentId) {
       },
       vertical: {}
     },
-    sourceType: 'Cashback',
-    text: {
+    amount: {
       parentId: groupId,
       id: (0, _uuid.v4)(),
       open: true,
       type: 'TEXT',
       specialContent: [],
-      text: 'Make money and shop on Cendol!',
+      text: 'RM1000',
       content: {
         sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
-        fontWeight: 400,
-        fontSize: 14,
+        fontWeight: 700,
+        fontSize: 18,
+        pcFontSize: 42,
         color: '#fff',
         textAlign: 'center'
       },
@@ -79,75 +78,75 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON(parentId) {
       },
       vertical: {}
     },
-    button: {
-      parentId: groupId,
-      id: (0, _uuid.v4)(),
-      open: true,
-      type: 'BUTTON',
-      text: 'Button',
-      content: {
-        url: '',
-        backgroundColor: '#fff'
-      },
-      buttonText: {
-        sizeType: 'Customize font styles',
-        fontFamily: 'Open Sans',
-        fontWeight: 700,
-        fontSize: 13,
-        fontStyle: 'normal',
-        color: '#F52D85'
-      },
-      buttonBorder: {
+    sourceType: 'Cashback',
+    hover: {
+      open: false,
+      image: {
+        parentId: groupId,
+        id: (0, _uuid.v4)(),
         open: true,
-        borderColor: '',
-        borderRadius: 4
-      },
-      buttonIcon: {
-        iconUrl: '',
-        layout: 'right'
-      },
-      spacing: {
-        pc: {
-          paddingTop: 6,
-          paddingBottom: 6,
-          paddingLeft: 16,
-          paddingRight: 16
+        type: 'IMAGE',
+        content: {
+          h5Name: 'Group Name',
+          pcName: 'Group Name',
+          h5ImgSrc: '',
+          pcImgSrc: '',
+          clickUrl: ''
         },
-        mobile: {
-          paddingTop: 6,
-          paddingBottom: 6,
-          paddingLeft: 16,
-          paddingRight: 16
+        hover: {
+          open: false,
+          backgroundType: 'enlarge',
+          magnification: 1.5,
+          pcImgHoverUrl: '',
+          h5ImgHoverUrl: ''
         }
-      }
-    },
-    peek: {
-      parentId: groupId,
-      id: (0, _uuid.v4)(),
-      open: true,
-      type: 'TEXT',
-      specialContent: [],
-      text: '',
-      content: {
-        sizeType: 'Customize font styles',
-        fontFamily: 'Open Sans',
-        fontWeight: 400,
-        fontSize: 12,
-        color: '#fff',
-        textAlign: 'center'
       },
-      underline: {
-        open: false,
-        textDecorationColor: '',
-        textDecorationStyle: 'solid'
+      title: {
+        parentId: groupId,
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'TEXT',
+        specialContent: [],
+        text: 'Cashback',
+        content: {
+          sizeType: 'Customize font styles',
+          fontFamily: 'Open Sans',
+          fontWeight: 400,
+          fontSize: 14,
+          pcFontSize: 20,
+          color: '#fff',
+          textAlign: 'center'
+        },
+        underline: {
+          open: false,
+          textDecorationColor: '',
+          textDecorationStyle: 'solid'
+        },
+        vertical: {}
       },
-      vertical: {}
-    },
-    background: {
-      opacity: 100,
-      color: '#F52D85',
-      image: '',
-      bgType: 'color'
+      amount: {
+        parentId: groupId,
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'TEXT',
+        specialContent: [],
+        text: 'RM1000',
+        content: {
+          sizeType: 'Customize font styles',
+          fontFamily: 'Open Sans',
+          fontWeight: 700,
+          fontSize: 18,
+          pcFontSize: 42,
+          color: '#fff',
+          textAlign: 'center'
+        },
+        underline: {
+          open: false,
+          textDecorationColor: '',
+          textDecorationStyle: 'solid'
+        },
+        vertical: {}
+      }
     }
   };
 };
@@ -186,30 +185,7 @@ var getDefaultJSON = function getDefaultJSON() {
         }
       }
     },
-    groupSource: [imagesGroupSourceJSON(groupId)],
-    setting: {
-      // 自动轮播
-      autoplay: {
-        open: true,
-        interval: 3
-      },
-      // 切换按钮
-      navigation: {
-        open: true,
-        size: 16,
-        hoverSize: 16,
-        color: '#eee',
-        hoverColor: '#fff'
-      },
-      // 面板指示点
-      dots: {
-        open: true,
-        color: '#eee',
-        hoverColor: '#fff',
-        size: 8,
-        hoverSize: 8
-      }
-    },
+    groupSource: [imagesGroupSourceJSON(groupId), imagesGroupSourceJSON(groupId)],
     spacing: {
       pc: {
         paddingTop: 48,

package/es/composite-comp/bol/components/Wallet/index.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _pc = _interopRequireDefault(require("./pc"));
+
 var _mobile = _interopRequireDefault(require("./mobile"));
 
 var _defaultJSON = require("./defaultJSON");
@@ -57,28 +59,30 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 
-var Wallet =
+var ImageGallery =
 /** @class */
 function (_super) {
-  __extends(Wallet, _super);
+  __extends(ImageGallery, _super);
 
-  function Wallet() {
+  function ImageGallery() {
     return _super !== null && _super.apply(this, arguments) || this;
   }
 
-  Wallet.prototype.render = function () {
+  ImageGallery.prototype.render = function () {
     var nodeData = this.props.nodeData;
-    return /*#__PURE__*/_react["default"].createElement("div", null, window.magicDesign.device === 'pc' ? null : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
+    return /*#__PURE__*/_react["default"].createElement("div", null, window.magicDesign.device === 'pc' ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
+      data: nodeData
+    }) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
       data: nodeData
     }));
   };
 
-  Wallet.defaultProps = {};
-  Wallet.type = 'WALLET';
-  Wallet.getDefaultJSON = _defaultJSON.getDefaultJSON;
-  Wallet = __decorate([_compositeDecorator["default"]], Wallet);
-  return Wallet;
+  ImageGallery.defaultProps = {};
+  ImageGallery.type = 'WALLET';
+  ImageGallery.getDefaultJSON = _defaultJSON.getDefaultJSON;
+  ImageGallery = __decorate([_compositeDecorator["default"]], ImageGallery);
+  return ImageGallery;
 }(_react.Component);
 
-var _default = Wallet;
+var _default = ImageGallery;
 exports["default"] = _default;