@fonixtree/magic-design 0.1.54 → 0.1.55

package/es/composite-comp/dito/components/SearchBar/mobile/index.less

@@ -1,51 +1,58 @@
 .m-search-bar {
-  height: 0.96rem;
-  padding: 0.16rem 0;
+  height: 48px;
+  padding: 8px 0;
   display: flex;
   flex-direction: row-reverse;
   align-items: center;
   justify-content: space-between;
   width: 100%;
-}
-.m-search-bar .right {
-  display: flex;
-  flex: 1;
-  margin-left: 0.3rem;
-  align-items: center;
-  justify-content: space-between;
-}
-.m-search-bar .right .search-input-wrap {
-  flex: 1;
-  background: #fff;
-  border-radius: 0.08rem;
-  border: 0.02rem solid #D2D9E5;
-  padding: 0.08rem 0.24rem;
-  height: 0.64rem;
-  text-align: right;
-  display: flex;
-  justify-content: flex-end;
-}
-.m-search-bar .right .message-wrap {
-  position: relative;
-  margin-left: 0.2rem;
-}
-.m-search-bar .right .message-wrap .num {
-  position: absolute;
-  top: -0.12rem;
-  right: -0.12rem;
-  display: inline-block;
-  padding: 0.02rem 0.04rem;
-  min-width: 0.34rem;
-  text-align: center;
-  background-color: #CE1126;
-  border: 0.02rem solid #fff;
-  border-radius: 0.16rem;
-  font-family: 'Montserrat';
-  font-style: normal;
-  font-weight: 600;
-  font-size: 0.16rem;
-  color: #FFFFFF;
-}
-.m-search-bar .logo img {
-  width: auto;
-}
+
+  .right {
+    display: flex;
+    flex: 1;
+    margin-left: 15px;
+    align-items: center;
+    justify-content: space-between;
+
+    .search-input-wrap {
+      flex: 1;
+      background: #fff;
+      border-radius: 4px;
+      border: 1px solid #D2D9E5;
+      padding: 4px 12px;
+      height: 32px;
+      text-align: right;
+      display: flex;
+      justify-content: flex-end;
+    }
+
+    .message-wrap {
+      position: relative;
+      margin-left: 10px;
+
+      .num {
+        position: absolute;
+        top: -6px;
+        right: -6px;
+        display: inline-block;
+        padding: 1px 2px;
+        min-width: 17px;
+        text-align: center;
+        background-color: #CE1126;
+        border: 1px solid #fff;
+        border-radius: 8px;
+        font-family: 'Montserrat';
+        font-style: normal;
+        font-weight: 600;
+        font-size: 8px;
+        color: #FFFFFF;
+      }
+    }
+  }
+
+  .logo {
+    img {
+      width: auto;
+    }
+  }
+}

package/es/composite-comp/dito/components/SignBoard/mobile/index.js

@@ -331,10 +331,10 @@ function (_super) {
   };
 
   SignBoardMobile.prototype.render = function () {
-    var _this = this;
+    var _this = this; // const { data } = this.props;
+    // console.log('--SignBoard', data);
+
 
-    var data = this.props.data;
-    console.log('--SignBoard', data);
     var _a = this.state,
         storeInfo = _a.storeInfo,
         isFollow = _a.isFollow,

package/es/composite-comp/dito/components/SignBoard/mobile/index.less

@@ -1,78 +1,82 @@
 .m-sign-board-bar {
   width: 100%;
-}
-.m-sign-board-bar .search {
-  width: 100%;
-  background: #EEEEEE;
-  border-radius: 0.16rem;
-  padding: 0.16rem 0.24rem;
-  height: 0.72rem;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 0.08rem;
-}
-.m-sign-board-bar .search .search-input {
-  height: 0.4rem;
-  font-weight: 400;
-  font-size: 0.32rem;
-  line-height: 0.4rem;
-  padding: 0;
-  background-color: transparent;
-  border: none;
-}
-.m-sign-board-bar .store-info-wrap {
-  display: flex;
-  align-items: center;
-  margin-top: 0.4rem;
-}
-.m-sign-board-bar .store-info-wrap .number {
-  font-family: 'Montserrat';
-  font-weight: 400;
-  font-size: 0.24rem;
-  line-height: 0.32rem;
-  color: #696973;
-  display: flex;
-  align-items: center;
-}
-.m-sign-board-bar .store-info-wrap .number > img {
-  width: 0.28rem;
-}
-.m-sign-board-bar .store-info-wrap .number > span {
-  font-weight: 700;
-  font-size: 0.28rem;
-  line-height: 0.36rem;
-  color: #333333;
-  margin: 0 0.08rem;
-}
-.m-sign-board-bar .store-info-wrap .number:nth-child(2) {
-  margin-left: 0.48rem;
-  flex: 1;
-}
-.m-sign-board-bar .store-info-wrap .chat-btn {
-  padding: 0.1rem 0.24rem;
-  background: #FFFFFF;
-  border: 0.02rem solid #333333;
-  border-radius: 0.08rem;
-  width: fit-content;
-  font-family: 'Montserrat';
-  font-weight: 400;
-  font-size: 0.24rem;
-  line-height: 0.32rem;
-  text-transform: uppercase;
-  color: #333333;
-}
-.m-sign-board-bar .store-info-wrap .store-logo {
-  width: 0.88rem;
-  height: 0.88rem;
-  border-radius: 50%;
-}
-.m-sign-board-bar .store-info-wrap .store-name {
-  flex: 1;
-  margin-left: 0.24rem;
-  font-weight: 500;
-  font-size: 0.32rem;
-  line-height: 0.4rem;
-  color: #070707;
-  font-family: 'Montserrat';
-}
+
+  .search {
+    width: 100%;
+    background: #EEEEEE;
+    border-radius: 8px;
+    padding: 8px 12px;
+    height: 36px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 4px;
+    .search-input {
+      height: 20px;
+      font-weight: 400;
+      font-size: 16px;
+      line-height: 20px;
+      padding: 0;
+      background-color: transparent;
+      border: none;
+    }
+  }
+
+  .store-info-wrap {
+    display: flex;
+    align-items: center;
+    margin-top: 20px;
+    .number {
+      font-family: 'Montserrat';
+      font-weight: 400;
+      font-size: 12px;
+      line-height: 16px;
+      color: #696973;
+      display: flex;
+      align-items: center;
+      &> img {
+        width: 14px;
+      }
+      &> span {
+        font-weight: 700;
+        font-size: 14px;
+        line-height: 18px;
+        color: #333333;
+        margin: 0 4px;
+      }
+      &:nth-child(2) {
+        margin-left: 24px;
+        flex: 1;
+      }
+    }
+    .chat-btn {
+      padding: 5px 12px;
+      // height: 26px;
+      background: #FFFFFF;
+      border: 1px solid #333333;
+      border-radius: 4px;
+      width: fit-content;
+      font-family: 'Montserrat';
+      font-weight: 400;
+      font-size: 12px;
+      line-height: 16px;
+      text-transform: uppercase;
+      color: #333333;
+    }
+    .store-logo {
+      width: 44px;
+      height: 44px;
+      border-radius: 50%;
+    }
+    .store-name {
+      flex: 1;
+      margin-left: 12px;
+      font-weight: 500;
+      font-size: 16px;
+      line-height: 20px;
+      color: #070707;
+      font-family: 'Montserrat';
+    }
+  }
+
+}

package/es/composite-comp/dito/components/SignBoard/pc/index.js

@@ -321,8 +321,8 @@ function (_super) {
   SignBoardPc.prototype.render = function () {
     var _this = this;
 
-    var data = this.props.data;
-    console.log('--SignBoardPc data', data);
+    var data = this.props.data; // console.log('--SignBoardPc data', data);
+
     var _a = this.state,
         storeInfo = _a.storeInfo,
         isFollow = _a.isFollow,

package/es/meta-comp/config-panels/TextConfig/index.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _antd = require("antd");
 
+var _coreUtil = require("src/components/utils/coreUtil");
+
 var _TextLabel = _interopRequireDefault(require("./TextLabel"));
 
 var _locale = require("../../../locale");
@@ -81,56 +83,56 @@ var sizeTypeList = [{
 }, {
   key: 'Headline 1',
   fontFamily: 'Montserrat',
-  pcFontSize: 50,
-  fontSize: 68,
+  fontSize: 42,
+  pcFontSize: 52,
   fontWeight: 600
 }, {
   key: 'Headline 2',
   fontFamily: 'Montserrat',
-  pcFontSize: 32,
-  fontSize: 42,
+  fontSize: 32,
+  pcFontSize: 42,
   fontWeight: 600
 }, {
   key: 'Headline 3',
   fontFamily: 'Montserrat',
-  pcFontSize: 30,
-  fontSize: 38,
+  fontSize: 30,
+  pcFontSize: 38,
   fontWeight: 600
 }, {
   key: 'Title 1',
   fontFamily: 'Montserrat',
-  pcFontSize: 28,
-  fontSize: 32,
+  fontSize: 28,
+  pcFontSize: 32,
   fontWeight: 400
 }, {
   key: 'Title 2',
   fontFamily: 'Montserrat',
-  pcFontSize: 20,
-  fontSize: 24,
+  fontSize: 20,
+  pcFontSize: 24,
   fontWeight: 400
 }, {
   key: 'Title 3',
   fontFamily: 'Montserrat',
-  pcFontSize: 18,
-  fontSize: 20,
+  fontSize: 18,
+  pcFontSize: 20,
   fontWeight: 400
 }, {
   key: 'Body 1',
   fontFamily: 'Open Sans',
-  pcFontSize: 16,
-  fontSize: 18,
+  fontSize: 16,
+  pcFontSize: 18,
   fontWeight: 400
 }, {
   key: 'Body 2',
   fontFamily: 'Open Sans',
-  pcFontSize: 14,
-  fontSize: 16,
+  fontSize: 14,
+  pcFontSize: 16,
   fontWeight: 400
 }, {
   key: 'Body 3',
   fontFamily: 'Open Sans',
-  pcFontSize: 12,
-  fontSize: 14,
+  fontSize: 12,
+  pcFontSize: 14,
   fontWeight: 400
 }];
 exports.sizeTypeList = sizeTypeList;
@@ -206,6 +208,12 @@ function (_super) {
       }, sizeTypeList.map(function (sizeType) {
         return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
           key: sizeType.key,
+          style: {
+            lineHeight: '1.1em',
+            fontFamily: sizeType.fontFamily,
+            fontWeight: sizeType.fontWeight,
+            fontSize: (0, _coreUtil.isPc)() ? sizeType.fontSize : sizeType.fontSize
+          },
           value: sizeType.key
         }, sizeType.key);
       }))), textData.sizeType == 'Customize font styles' && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
@@ -241,7 +249,7 @@ function (_super) {
           var count = _a.count;
 
           if (window.magicDesign.device == 'pc') {
-            textData.pcFontSize = count;
+            textData.fontSize = count;
           } else {
             textData.fontSize = count;
           }
@@ -250,7 +258,7 @@ function (_super) {
         },
         unit: "px",
         value: {
-          count: window.magicDesign.device == 'pc' ? textData.pcFontSize : textData.fontSize
+          count: window.magicDesign.device == 'pc' ? textData.fontSize : textData.fontSize
         }
       }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: ""

package/lib/assets/less/cylon-antd.less

@@ -53,7 +53,6 @@ body {
   font-variant: tabular-nums;
   line-height: 1.5715;
   background-color: #fff;
-  font-feature-settings: 'tnum'
 }
 
 [tabindex='-1']:focus {

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

@@ -1,54 +1,80 @@
 .m-banner-mobile {
   position: relative;
-}
-.m-banner-mobile .cylon-carousel .slick-track {
-  display: flex;
-  align-items: center;
-}
-.m-banner-mobile .carouselItem {
-  position: relative;
-  display: flex;
-}
-.m-banner-mobile .carouselItem .carouseContent {
-  padding: 1.6rem 0.56rem 0;
-  position: absolute;
-  z-index: 2;
-  display: flex;
-  flex-direction: column;
-  margin-bottom: auto;
-}
-.m-banner-mobile .carouselItem .title {
-  margin-bottom: 0.16rem;
-}
-.m-banner-mobile .carouselItem .sub-title {
-  margin-bottom: 0.4rem;
-}
-.m-banner-mobile .carouselItem .btn-wrap {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-}
-.m-banner-mobile .carouselItem .btn-wrap .btn {
-  margin-right: 0.24rem;
-}
-.m-banner-mobile .swiper-ban {
-  position: absolute;
-  width: 100%;
-  bottom: 0.2rem;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.m-banner-mobile .swiper-ban .ban {
-  font-size: 0.32rem;
-  width: 1.5em;
-  height: 0.3em;
-  background: #FFF;
-  cursor: inherit;
-  margin-right: 0.3em;
-  transition: all 0.5s;
-}
-.m-banner-mobile .swiper-ban .ban.active {
-  width: 1.5em;
-  opacity: 1;
-}
+  // .turnPage {
+  //   position: absolute;
+  //   top: 50%;
+  //   transform: translateY(-50%);
+  //   z-index: 3;
+  //   cursor: pointer;
+  // }
+  // .leftBtn {
+  //   left: 20px;
+  // }
+  // .rightBtn {
+  //   right: 20px;
+  // }
+
+  .cylon-carousel {
+    .slick-track {
+      display: flex;
+      align-items: center;
+    }
+  }
+
+  .carouselItem {
+    // height: 386px;
+    position: relative;
+    display: flex;
+
+    .carouseContent {
+      padding: 80px 28px 0;
+      position: absolute;
+      z-index: 2;
+      display: flex;
+      flex-direction: column;
+      margin-bottom: auto;
+    }
+
+    .title {
+      margin-bottom: 8px;
+    }
+
+    .sub-title {
+      margin-bottom: 20px;
+    }
+
+    .btn-wrap {
+      display: flex;
+      align-items: center;
+      justify-content: flex-start;
+
+      .btn {
+        margin-right: 12px;
+      }
+    }
+  }
+
+  .swiper-ban {
+    position: absolute;
+    width: 100%;
+    bottom: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .ban {
+      font-size: 16px;
+      width: 1.5em;
+      height: 0.3em;
+      background: #FFF;
+      cursor: inherit;
+      margin-right: 0.3em;
+      transition: all .5s;
+
+      &.active {
+        width: 1.5em;
+        opacity: 1;
+      }
+    }
+  }
+}