@fonixtree/magic-design 0.1.22 → 0.1.24

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

@@ -1,44 +1,53 @@
 .video-layout3-wrap {
   display: flex;
   flex-direction: column;
-}
-.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%);
-  width: 1.2rem;
-  height: 1.2rem;
-  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-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/lib/composite-comp/bol/components/Video/mobile/index.less

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

package/lib/composite-comp/bol/components/Wallet/mobile/index.less

@@ -1,27 +1,40 @@
-.m-Wallet-mobile .headline {
-  margin-bottom: 0.14rem;
-}
-.m-Wallet-mobile .content {
-  display: flex;
-  flex-wrap: wrap;
-}
-.m-Wallet-mobile .content.column_3 .item-wrap .title {
-  top: 13%;
-}
-.m-Wallet-mobile .content.column_3 .item-wrap .amount {
-  bottom: 13%;
-}
-.m-Wallet-mobile .content .item-wrap {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  border-radius: 0.2rem;
-}
-.m-Wallet-mobile .content .item-wrap .image {
-  border-radius: 0.2rem;
-  overflow: hidden;
-}
-.m-Wallet-mobile .content .item-wrap .text-content {
-  position: absolute;
-}
+.m-Wallet-mobile {
+
+  .headline {
+    margin-bottom: 7px;
+  }
+
+  .content {
+    display: flex;
+    flex-wrap: wrap;
+
+    &.column_3 {
+      .item-wrap {
+        .title {
+          top: 13%;
+        }
+
+        .amount {
+          bottom: 13%;
+        }
+      }
+    }
+
+    .item-wrap {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      position: relative;
+      border-radius: 10px;
+
+      .image {
+        border-radius: 10px;
+        overflow: hidden;
+      }
+
+      .text-content {
+        position: absolute;
+      }
+    }
+  }
+}

package/lib/composite-comp/common/config-panels/CustomizeConfig/index.js

@@ -21,8 +21,6 @@ var _coreUtil = require("../../../../utils/coreUtil");
 
 var _common = require("../../../../common");
 
-var _mobx = require("../../../../mobx");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
@@ -53,22 +51,6 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
-var __assign = void 0 && (void 0).__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-
-      for (var p in s) {
-        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-      }
-    }
-
-    return t;
-  };
-
-  return __assign.apply(this, arguments);
-};
-
 var __decorate = void 0 && (void 0).__decorate || function (decorators, target, key, desc) {
   var c = arguments.length,
       r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
@@ -92,28 +74,18 @@ function (_super) {
     };
 
     _this.onInit = function (v) {
-      var _a;
-
-      var _b = _this.props,
-          component = _b.component,
-          id = _b.id; // 轮播组件特殊处理
-
-      if (component === 'carousel') {
-        if (v === 'layout2') {
-          _this.setState({
-            showRowNum: false
-          });
-        } else {
-          _this.setState({
-            showRowNum: true
-          });
-        }
-
-        _this.props.store.setState({
-          CarouselStore: __assign(__assign({}, _mobx.store.CarouselStore), (_a = {}, _a[id] = v, _a))
-        });
-      } // 图文组件，移动端，只有第3个组件可选列数
-
+      var _a = _this.props,
+          component = _a.component,
+          id = _a.id; // 轮播组件特殊处理
+      // if (component === 'carousel') {
+      //   if (v === 'layout2') {
+      //     this.setState({ showRowNum: false });
+      //   } else {
+      //     this.setState({ showRowNum: true });
+      //   }
+      //   this.props.store.setState({ CarouselStore: { ...store.CarouselStore, [id]: v } });
+      // }
+      // 图文组件，移动端，只有第3个组件可选列数
 
       if (component === 'imageText') {
         if (!(0, _coreUtil.isPc)()) {

package/lib/composite-comp/common/config-panels/CustomizeConfig/index.less

@@ -2,7 +2,8 @@
 
   .selectWrap {
     position: relative;
-
+    display: flex;
+    
     .iconNum {
       position: absolute;
       z-index: 9;

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

@@ -1,86 +1,100 @@
 .m-flash-deal-mobile {
   display: flex;
   flex-direction: column;
-  padding: 0.32rem 0.32rem 0.56rem 0.32rem;
-}
-.m-flash-deal-mobile .flash-deal-title {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-.m-flash-deal-mobile .flash-deal-title .left {
-  display: flex;
-  align-items: center;
-}
-.m-flash-deal-mobile .flash-deal-title .left .icon {
-  height: 0.36rem;
-  margin-right: 0.2rem;
-}
-.m-flash-deal-mobile .flash-deal-title .left .title {
-  font-family: 'Montserrat';
-  font-style: normal;
-  font-weight: 600;
-  font-size: 0.28rem;
-  line-height: 0.36rem;
-  color: #2C2C2C;
-  margin-right: 0.2rem;
-}
-.m-flash-deal-mobile .flash-deal-title .left .sub-title {
-  font-family: 'Montserrat';
-  font-style: normal;
-  font-weight: 600;
-  font-size: 0.2rem;
-  line-height: 0.36rem;
-  color: #2C2C2C;
-  margin-right: 0.12rem;
-  align-self: end;
-}
-.m-flash-deal-mobile .flash-deal-title .right {
-  display: flex;
-  align-items: center;
-}
-.m-flash-deal-mobile .flash-deal-title .right .text {
-  font-family: 'Montserrat';
-  font-style: normal;
-  font-weight: 600;
-  font-size: 0.24rem;
-  line-height: 0.3rem;
-  color: #0038A8;
-  margin-right: 0.1rem;
-}
-.m-flash-deal-mobile .flash-deal-title .right .btn {
-  white-space: nowrap;
-}
-.m-flash-deal-mobile .flash-deal-list {
-  margin-top: 0.32rem;
-  overflow-x: auto;
-  overflow-y: hidden;
-  white-space: nowrap;
-  display: flex;
-  align-items: flex-start;
-  justify-content: flex-start;
-  position: relative;
-}
-.m-flash-deal-mobile .flash-deal-list .loading-wrap {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 0.6rem;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  margin: auto;
-}
-.m-flash-deal-mobile .flash-deal-list .m-product-item-wrap {
-  width: 2.84rem;
-  margin-right: 0.16rem;
-}
-.m-flash-deal-mobile .flash-deal-list .m-product-item-wrap .product-img {
-  height: 2.8rem;
-  width: 2.8rem;
-}
-.m-flash-deal-mobile .flash-deal-list .m-product-item-wrap .product-name {
-  height: 0.72rem;
-}
+  padding: 16px 16px 28px 16px;
+
+  .flash-deal-title {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .left {
+      display: flex;
+      align-items: center;
+
+      .icon {
+        height: 18px;
+        margin-right: 10px;
+      }
+
+      .title {
+        font-family: 'Montserrat';
+        font-style: normal;
+        font-weight: 600;
+        font-size: 14px;
+        line-height: 18px;
+        color: #2C2C2C;
+        margin-right: 10px;
+      }
+
+      .sub-title {
+        font-family: 'Montserrat';
+        font-style: normal;
+        font-weight: 600;
+        font-size: 10px;
+        line-height: 18px;
+        color: #2C2C2C;
+        margin-right: 6px;
+        align-self: end;
+      }
+    }
+
+    .right {
+      display: flex;
+      align-items: center;
+
+      .text {
+        font-family: 'Montserrat';
+        font-style: normal;
+        font-weight: 600;
+        font-size: 12px;
+        line-height: 15px;
+        color: #0038A8;
+        margin-right: 5px;
+      }
+
+      .btn {
+        white-space: nowrap;
+      }
+    }
+  }
+
+  .flash-deal-list {
+    margin-top: 16px;
+    overflow-x: auto;
+    overflow-y: hidden;
+    white-space: nowrap;
+    display: flex;
+    align-items: flex-start;
+    justify-content: flex-start;
+    position: relative;
+
+    .loading-wrap {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      padding: 30px;
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      margin: auto;
+    }
+
+    // 秒杀特有样式
+    .m-product-item-wrap {
+      width: 142px;
+      margin-right: 8px;
+
+      .product-img {
+        height: 140px;
+        width: 140px;
+      }
+
+      .product-name {
+        height: 36px;
+      }
+    }
+  }
+}

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

@@ -1,21 +1,38 @@
-.mobile-navigation-mobile .group-wrap {
-  padding: 0 0.4rem;
-  display: flex;
+.mobile-navigation-mobile {
+  // display: flex;
+  // flex-direction: column;
+  // padding-top: 18px;
+  .group-wrap {
+    padding: 0 20px;
+    display: flex;
+    .one-card {
+      // display: flex;
+
+      .card-image-wrap {
+        margin-bottom: 4px;
+        width: 100%;
+      }
+    }
+  } 
+
 }
-.mobile-navigation-mobile .group-wrap .one-card .card-image-wrap {
-  margin-bottom: 0.08rem;
-  width: 100%;
+
+.newline {
+  .group-wrap {
+    flex-wrap: wrap;
+  }
 }
-.newline .group-wrap {
-  flex-wrap: wrap;
-}
-.tile .group-wrap {
-  overflow-x: auto;
-  flex-wrap: nowrap;
-  scroll-snap-type: x;
-  padding: 0 0.3rem;
-}
-.tile .group-wrap .one-card {
-  flex-shrink: 0;
-  scroll-snap-align: end;
+
+.tile {
+  .group-wrap {
+    // overflow-x: scroll;
+    overflow-x: auto;
+    flex-wrap: nowrap;
+    scroll-snap-type: x;
+    padding: 0 15px;
+    .one-card {
+      flex-shrink: 0;
+      scroll-snap-align: end;
+    }
+  }
 }

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

@@ -1,76 +1,89 @@
 .m-recommend-mobile {
   display: flex;
   flex-direction: column;
-}
-.m-recommend-mobile .cylon-tabs-nav-operations {
-  display: none !important;
-}
-.m-recommend-mobile ::-webkit-scrollbar {
-  width: 0;
-  height: 0;
-  display: none;
-}
-.m-recommend-mobile .tab-select-wrap {
-  display: flex;
-  align-items: center;
-  height: 1rem;
-  background: #ffffff;
-  overflow: auto;
-  position: relative;
-  margin-bottom: 0.3rem;
-}
-.m-recommend-mobile .tab-select-wrap .tabTitle {
-  display: flex;
-  align-items: center;
-  text-align: center;
-  padding: 0 0.32rem;
-  width: fit-content;
-  height: 100%;
-  justify-content: center;
-  white-space: nowrap;
-  flex-direction: column;
-}
-.m-recommend-mobile .tab-select-wrap .tabTitle img {
-  height: 0.4rem;
-  width: 0.4rem;
-  margin-bottom: 0.04rem;
-}
-.m-recommend-mobile .tab-select-wrap .active-line {
-  position: absolute;
-  bottom: 0;
-  width: 4rem;
-  height: 0.06rem;
-  background-color: #fff;
-  transition: 0.2s all linear;
-  border-radius: 0.03rem;
-}
-.m-recommend-mobile .macyContainer {
-  display: flex;
-  margin: 0 0.32rem;
-}
-.m-recommend-mobile .scrollContainer {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  margin: 0 0.32rem;
-  overflow-x: auto;
-  padding-bottom: 0.3rem;
-}
-.m-recommend-mobile .scrollContainer.pl_100 {
-  padding-left: 2rem;
-}
-.m-recommend-mobile .scrollContainer .scrollProductList {
-  display: flex;
-  flex-direction: row;
-  align-items: flex-start;
-}
-.m-recommend-mobile .scrollContainer .scrollProductList .productCard {
-  margin-right: 0.24rem;
-}
-.m-recommend-mobile .btnSeeAll {
-  display: block;
-  width: fit-content;
-  min-width: 1.6rem;
-  margin: 0 auto;
-  flex: none;
-}
+
+  .cylon-tabs-nav-operations {
+    display: none !important;
+  }
+
+  ::-webkit-scrollbar {
+    width: 0;
+    height: 0;
+    display: none;
+  }
+
+
+  .tab-select-wrap {
+    display: flex;
+    align-items: center;
+    height: 50px;
+    background: rgb(255 255 255);
+    overflow: auto;
+    position: relative;
+    margin-bottom: 15px;
+
+    .tabTitle {
+      display: flex;
+      align-items: center;
+      text-align: center;
+      padding: 0 16px;
+      width: fit-content;
+      height: 100%;
+      justify-content: center;
+      white-space: nowrap;
+      flex-direction: column;
+
+      img {
+        height: 20px;
+        width: 20px;
+        margin-bottom: 2px;
+      }
+    }
+
+    .active-line {
+      position: absolute;
+      bottom: 0;
+      width: 200px;
+      height: 3px;
+      background-color: #fff;
+      transition: .2s all linear;
+      border-radius: 1.5px;
+    }
+  }
+
+  .macyContainer {
+    display: flex;
+    margin: 0 16px;
+  }
+
+  .scrollContainer {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin: 0 16px;
+    overflow-x: auto;
+    padding-bottom: 15px;
+
+    &.pl_100 {
+      padding-left: 100px;
+    }
+
+    .scrollProductList {
+      display: flex;
+      flex-direction: row;
+      align-items: flex-start;
+
+      .productCard {
+        margin-right: 12px;
+      }
+    }
+  }
+
+  .btnSeeAll {
+    display: block;
+    width: fit-content;
+    min-width: 80px;
+    margin: 0 auto;
+    flex: none;
+  }
+}