@fonixtree/magic-design 1.0.70 → 1.0.73

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

@@ -1,68 +1,64 @@
 .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;
-    }
-  }
-
-}
+}
+.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;
+}

package/es/utils/commonUtil.js

@@ -296,7 +296,9 @@ function commonFetch(url, data, method) {
   });
 }
 
-var navigateTo = function navigateTo(url) {
+var navigateTo = function navigateTo(url, state) {
+  console.log('navigateTo', url);
+
   if (!url) {
     return;
   }
@@ -309,7 +311,7 @@ var navigateTo = function navigateTo(url) {
   if (!appUrl && !h5Url.startsWith('/')) {
     window.location.href = h5Url;
   } else if (window.magicDesign.history) {
-    window.magicDesign.history.push(url);
+    window.magicDesign.history.push(url, state);
   } else if (window.magicDesign.navigatePreUrl) {
     // 预览模式跳转
     if (h5Url.startsWith('/')) {
@@ -748,8 +750,8 @@ function pushGA(data, eventName) {
         groupName: data.groupName,
         elementId: data.elementId,
         elementName: data.elementName
-      };
-      console.log('GA push', eventName, eventData);
+      }; // console.log('GA push', eventName, eventData);
+
       if (window.gtag) window.gtag('event', eventName, eventData);
     }
   } catch (error) {

package/es/utils/coreUtil.js

@@ -286,22 +286,6 @@ var getCoupon = function getCoupon(couponId) {
   });
 };
 
-function isUrl(string) {
-  // var pattern = new RegExp('^(https?:\\/\\/)?' + // 协议
-  //   '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // 域名
-  //   '((\\d{1,3}\\.){3}\\d{1,3}))' + // 或者 IP (v4) 地址
-  //   '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // 端口和路径
-  //   '(\\?[;&a-z\\d%_.~+=-]*)?' + // 查询字符串
-  //   '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator
-  // return !!pattern.test(string);
-  try {
-    new URL(string);
-    return true;
-  } catch (_) {
-    return false;
-  }
-}
-
 var clickUrl = function clickUrl(url) {
   if (url === void 0) {
     url = '';
@@ -318,25 +302,8 @@ var clickUrl = function clickUrl(url) {
       data = _a.data;
 
   var _b = data.params,
-      params = _b === void 0 ? {} : _b;
-  console.log('clicked data:', data);
-  console.log({
-    type: 'jumpBrowser',
-    params: {
-      url: params.link
-    }
-  });
-  /** 锚点跳转 */
-
-  if (params.type === 'ANCHOR') {
-    (0, _commonUtil.ensure)(function () {
-      var nodeId = isPc() ? params.data.pcNodeId : params.data.mobileNodeId;
-      document.querySelector("#node-" + nodeId).scrollIntoView({
-        behavior: 'smooth'
-      });
-    });
-    return;
-  }
+      params = _b === void 0 ? {} : _b; // console.log('clicked data:', data);
+  // console.log({ type: 'jumpBrowser', params: { url: params.link } });
 
   if ((0, _androidUtil.browserVersion)().isAshitaApp) {
     (0, _androidUtil.sendToApp)(data);
@@ -369,25 +336,9 @@ var clickUrl = function clickUrl(url) {
       }
 
       return;
-    } // 输入的是完整的跳转地址
-
-
-    if (isUrl(link)) {
-      if (!link.includes(window.location.host)) {
-        // 跳转外链 需要把userToken带上
-        if (link.includes('?')) {
-          var a = link + "&userToken=" + (localStorage.getItem('h5Token') || '');
-          window.open(a);
-        } else {
-          var a = link + "?userToken=" + (localStorage.getItem('h5Token') || '');
-          window.open(a);
-        }
-      } else {
-        window.open(link);
-      }
-    } else {
-      (0, _commonUtil.navigateTo)(link);
     }
+
+    (0, _commonUtil.navigateTo)(link);
   }
 };
 

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

@@ -1,80 +1,54 @@
 .m-banner-mobile {
   position: relative;
-  // .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: 0 28px;
-      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;
-      }
-    }
-  }
-}
+}
+.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: 0 0.56rem;
+  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;
+}

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

@@ -1,103 +1,84 @@
 .m-carousel-mobile {
   position: relative;
   width: 100%;
-
-  .content {
-    display: flex;
-    margin: 0 auto;
-  }
-
-  .slider-wrap {
-    width: 100%;
-    margin: 0 auto;
-    line-height: 1;
-
-    .slick-list {
-      // margin-left: -11px;
-      // margin-right: -11px;
-      padding: 0;
-
-      &:hover {
-        padding-top: 100px;
-        margin-top: -100px;
-        padding-bottom: 100px;
-        margin-bottom: -100px;
-      }
-
-      .slick-track {
-        display: flex;
-        align-items: center;
-        gap: 12px;
-      }
-    }
-
-    .img-wrap {
-      .img {
-        width: fit-content;
-        height: fit-content;
-        display: block;
-        margin: 0 auto;
-      }
-
-      .title {
-        display: flex;
-        justify-content: center;
-        margin-top: 12px;
-      }
-
-      .text {
-        display: flex;
-        justify-content: center;
-        margin-top: 6px;
-      }
-
-      .tags {
-        margin-top: 8px;
-        margin-bottom: 12px;
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: center;
-
-        >div {
-          margin-right: 8px;
-
-          &:last-child {
-            margin-right: 0;
-          }
-        }
-      }
-    }
-  }
-
-  .swiper-ban {
-    position: absolute;
-    width: 100%;
-    bottom: 6px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    .ban {
-      font-size: 8px;
-      width: 1em;
-      height: 1em;
-      border-radius: 50%;
-      background: #FFF;
-      cursor: inherit;
-      margin-right: 10px;
-      transition: all .5s;
-
-      &:last-child {
-        margin-right: 0;
-      }
-
-      &.active {
-        width: 2em;
-        height: 1em;
-        border-radius: 100px;
-        opacity: 1;
-      }
-    }
-  }
-}
+}
+.m-carousel-mobile .content {
+  display: flex;
+  margin: 0 auto;
+}
+.m-carousel-mobile .slider-wrap {
+  width: 100%;
+  margin: 0 auto;
+  line-height: 1;
+}
+.m-carousel-mobile .slider-wrap .slick-list {
+  padding: 0;
+}
+.m-carousel-mobile .slider-wrap .slick-list:hover {
+  padding-top: 2rem;
+  margin-top: -2rem;
+  padding-bottom: 2rem;
+  margin-bottom: -2rem;
+}
+.m-carousel-mobile .slider-wrap .slick-list .slick-track {
+  display: flex;
+  align-items: center;
+  gap: 0.24rem;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .img {
+  width: fit-content;
+  height: fit-content;
+  display: block;
+  margin: 0 auto;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .title {
+  display: flex;
+  justify-content: center;
+  margin-top: 0.24rem;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .text {
+  display: flex;
+  justify-content: center;
+  margin-top: 0.12rem;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .tags {
+  margin-top: 0.16rem;
+  margin-bottom: 0.24rem;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .tags > div {
+  margin-right: 0.16rem;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .tags > div:last-child {
+  margin-right: 0;
+}
+.m-carousel-mobile .swiper-ban {
+  position: absolute;
+  width: 100%;
+  bottom: 0.12rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.m-carousel-mobile .swiper-ban .ban {
+  font-size: 0.16rem;
+  width: 1em;
+  height: 1em;
+  border-radius: 50%;
+  background: #FFF;
+  cursor: inherit;
+  margin-right: 0.2rem;
+  transition: all 0.5s;
+}
+.m-carousel-mobile .swiper-ban .ban:last-child {
+  margin-right: 0;
+}
+.m-carousel-mobile .swiper-ban .ban.active {
+  width: 2em;
+  height: 1em;
+  border-radius: 2rem;
+  opacity: 1;
+}

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

@@ -1,22 +1,15 @@
-.m-image-gallery-mobile {
-  .content {
-    .line {
-      margin-bottom: 12px;
-
-      &.isHorizontal {
-        display: flex;
-        justify-content: flex-start;
-      }
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-
-      .img-wrap {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-    }
-  }
-}
+.m-image-gallery-mobile .content .line {
+  margin-bottom: 0.24rem;
+}
+.m-image-gallery-mobile .content .line.isHorizontal {
+  display: flex;
+  justify-content: flex-start;
+}
+.m-image-gallery-mobile .content .line:last-child {
+  margin-bottom: 0;
+}
+.m-image-gallery-mobile .content .line .img-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}