@fonixtree/magic-design 0.1.45 → 0.1.46

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/constants/index.js

@@ -47,6 +47,7 @@ var urlType = {
 exports.urlType = urlType;
 var urlTypeMap = {
   CATEGORY: 'Category',
+  STORE_CATEGORY: 'StoreCategory',
   CUSTOMIZED_PAGE: 'CustomizedPage',
   PRODUCT_DETAIL_PAGE: 'ProductDetailPage',
   FILTERED_PRODUCT: 'FilteredProduct',

package/lib/utils/businessUtil.js

@@ -49,6 +49,18 @@ var newParseUrl = function newParseUrl(urlObj) {
         }
       };
       break;
+
+    case _constants.urlTypeMap.STORE_CATEGORY:
+      // 商品列表
+      link = "/product/list/?storeCategory=" + value;
+      params = {
+        action: 'jump',
+        params: {
+          type: 'STORE_CATEGORY',
+          catgId: value
+        }
+      };
+      break;
     // 海报页面
 
     case _constants.urlTypeMap.CUSTOMIZED_PAGE:
@@ -316,13 +328,17 @@ var renderPreview = function renderPreview() {
 
 exports.renderPreview = renderPreview;
 
-var listToTree = function listToTree(list) {
+var listToTree = function listToTree(list, idName) {
+  if (idName === void 0) {
+    idName = 'catgId';
+  }
+
   var map = {};
   var node;
   var tree = [];
 
   for (var i = 0; i < list.length; i++) {
-    map[list[i].catgId] = list[i];
+    map[list[i][idName]] = list[i];
     list[i].children = list[i].isLeaf == 0 ? null : [];
   }
 
@@ -330,8 +346,8 @@ var listToTree = function listToTree(list) {
     node = {
       catgName: list[i].catgName,
       title: list[i].catgName,
-      value: list[i].catgId,
-      key: list[i].catgId,
+      value: list[i][idName],
+      key: list[i][idName],
       children: list[i].children
     };
 

package/lib/utils/commonUtil.js

@@ -211,10 +211,9 @@ function commonFetch(url, data, method) {
   return new Promise(function (resolve, reject) {
     var _a, _b;
 
-    var isLoginUrl = url.includes('portal/login');
     var credentials = localStorage.getItem('credentials');
     var headers = {
-      'Content-Type': isLoginUrl ? 'application/x-www-form-urlencoded' : 'application/json; charset=UTF-8',
+      'Content-Type': 'application/json; charset=UTF-8',
       credentials: credentials
     };
 
@@ -254,7 +253,7 @@ function commonFetch(url, data, method) {
         return;
       }
 
-      _axios["default"].post(url, isLoginUrl ? _qs["default"].stringify(data) : data, {
+      _axios["default"].post(url, data, {
         headers: headers
       }).then(function (res) {
         resolve(res.data);

package/package.json

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