@fonixtree/magic-design 0.1.69 → 0.1.70-nuri

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

@@ -1,38 +1,21 @@
-.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 {
+  padding: 0 0.4rem;
+  display: flex;
 }
-
-.newline {
-  .group-wrap {
-    flex-wrap: wrap;
-  }
+.mobile-navigation-mobile .group-wrap .one-card .card-image-wrap {
+  margin-bottom: 0.08rem;
+  width: 100%;
 }
-
-.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;
-    }
-  }
+.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;
 }

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

@@ -1,89 +1,76 @@
 .m-recommend-mobile {
   display: flex;
   flex-direction: column;
-
-  .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;
-  }
-}
+}
+.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;
+}

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

@@ -1,58 +1,51 @@
 .m-search-bar {
-  height: 48px;
-  padding: 8px 0;
+  height: 0.96rem;
+  padding: 0.16rem 0;
   display: flex;
   flex-direction: row-reverse;
   align-items: center;
   justify-content: space-between;
   width: 100%;
-
-  .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;
-    }
-  }
-}
+}
+.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;
+}

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

@@ -1,82 +1,78 @@
 .m-sign-board-bar {
   width: 100%;
-
-  .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';
-    }
-  }
-
-}
+}
+.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';
+}

package/lib/decorator/metaDecorator.js

@@ -95,7 +95,7 @@ function metaDecorator(WrappedComponent) {
               GAData = _c.GAData;
           (0, _commonUtil.pushGA)(__assign(__assign({}, GAData), {
             elementId: data.id,
-            elementName: data.text
+            elementName: data.text || GAData.groupName
           }));
           return;
         } // 组织冒泡

package/lib/locale/en/en.json

@@ -1,4 +1,6 @@
 {
+  "BOLD": "Bold",
+  "SEMIBOLD": "Semibold",
   "DARK": "Dark",
   "LIGHT": "Light",
   "AI_IMAGE": "AI Image",

package/lib/locale/es/es.json

@@ -1,4 +1,6 @@
 {
+  "BOLD": "Bold",
+  "SEMIBOLD": "Semibold",
   "DARK": "Dark",
   "LIGHT": "Light",
   "AI_IMAGE": "AI Image",

package/lib/locale/id/id.json

@@ -1,4 +1,6 @@
 {
+  "BOLD": "Bold",
+  "SEMIBOLD": "Semibold",
   "DARK": "Dark",
   "LIGHT": "Light",
   "AI_IMAGE": "AI Image",

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

@@ -241,8 +241,12 @@ function (_super) {
       }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: 400
       }, (0, _locale.i18n)('REGULAR')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+        value: 500
+      }, (0, _locale.i18n)('MEDIUM')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: 600
-      }, (0, _locale.i18n)('MEDIUM')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      }, (0, _locale.i18n)('SEMIBOLD')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+        value: 700
+      }, (0, _locale.i18n)('BOLD')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('FONT_SIZE')
       }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
         onChange: function onChange(_a) {

package/lib/utils/businessUtil.js

@@ -154,13 +154,14 @@ var newParseUrl = function newParseUrl(urlObj) {
       break;
 
     case _constants.urlTypeMap.AFFILIATE_PRODUCT:
-      // 跳转店铺
+      // 分销商品
       link = '';
       params = {
         action: 'operation',
         params: {
           type: 'AFFILIATE_PRODUCT',
-          productId: value
+          productName: value,
+          productId: productId
         }
       };
       break;

package/lib/utils/commonUtil.js

@@ -14,7 +14,7 @@ exports.copy2ClipBoard = copy2ClipBoard;
 exports.covertKey = covertKey;
 exports.dragSource = void 0;
 exports.ensure = ensure;
-exports.getColorRgba = void 0;
+exports.getGAData = exports.getColorRgba = void 0;
 exports.getPageDataMap = getPageDataMap;
 exports.nextTick = exports.navigateTo = exports.importAsync = exports.getUrlParams = void 0;
 exports.pushGA = pushGA;
@@ -33,6 +33,8 @@ var _uuid = require("uuid");
 
 var _qs = _interopRequireDefault(require("qs"));
 
+var _constants = require("../constants");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __assign = void 0 && (void 0).__assign || function () {
@@ -843,4 +845,15 @@ var compatibleNewPageData = function compatibleNewPageData(pageData) {
   }
 };
 
-exports.compatibleNewPageData = compatibleNewPageData;
+exports.compatibleNewPageData = compatibleNewPageData;
+
+var getGAData = function getGAData(data) {
+  var _a;
+
+  return {
+    moduleId: data.id,
+    moduleName: data.moduleIndex + '.' + ((_a = _constants.compInfoMap[data.type]) === null || _a === void 0 ? void 0 : _a.name)
+  };
+};
+
+exports.getGAData = getGAData;

package/lib/utils/coreUtil.js

@@ -11,8 +11,6 @@ var _businessUtil = require("./businessUtil");
 
 var _commonUtil = require("./commonUtil");
 
-var _androidUtil = require("./androidUtil");
-
 var _constants = require("../constants");
 
 var _MessageModal = _interopRequireDefault(require("../common/MessageModal"));
@@ -302,35 +300,33 @@ var clickUrl = function clickUrl(url) {
       data = _a.data;
 
   var _b = data.params,
-      params = _b === void 0 ? {} : _b;
-
-  if ((0, _androidUtil.browserVersion)().isApp) {
-    (0, _androidUtil.sendToApp)(data);
-  } else {
-    // 视频
-    if (params.type === 'VIDEO') {
-      (0, _Video.createVideoModal)((0, _uuid.v4)(), __assign(__assign({}, params.data), {
-        source: params.data.sourceUrl
-      }));
-      return;
-    } // 领取优惠券
-
-
-    if (params.type === 'GET_COUPON') {
-      getCoupon(params.couponId);
-      return;
-    }
+      params = _b === void 0 ? {} : _b; // if (browserVersion().isApp) {
+  //   sendToApp(data);
+  // } else {
+  // 视频
+
+  if (params.type === 'VIDEO') {
+    (0, _Video.createVideoModal)((0, _uuid.v4)(), __assign(__assign({}, params.data), {
+      source: params.data.sourceUrl
+    }));
+    return;
+  } // 领取优惠券
 
-    if (params.type === 'SHARE_URL' || params.type === 'AFFILIATE_PRODUCT') {
-      if (window.magicDesign.handleAction) {
-        window.magicDesign.handleAction(params);
-      }
 
-      return;
+  if (params.type === 'GET_COUPON') {
+    getCoupon(params.couponId);
+    return;
+  }
+
+  if (params.type === 'SHARE_URL' || params.type === 'AFFILIATE_PRODUCT') {
+    if (window.magicDesign.handleAction) {
+      window.magicDesign.handleAction(params);
     }
 
-    (0, _commonUtil.navigateTo)(link);
+    return;
   }
+
+  (0, _commonUtil.navigateTo)(link); // }
 };
 
 exports.clickUrl = clickUrl;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "0.1.69",
+  "version": "0.1.70-nuri",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",