@fonixtree/magic-design 0.1.45 → 0.1.47

package/es/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/es/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/es/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/es/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
     };
 
@@ -350,7 +366,7 @@ exports.listToTree = listToTree;
 
 var getPromotionList = function getPromotionList(offer) {
   var PROMOTION_TYPE_MAP = {
-    2: 'SPECIAL PROMO',
+    2: 'FLASH',
     4: 'Group',
     C: 'Discount',
     D: 'Discount',

package/es/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/lib/common/LinkModal/StoreCatgTable/index.js

@@ -0,0 +1,244 @@
+"use strict";
+
+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); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = StoreCatgTable;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _antd = require("antd");
+
+var _commonUtil = require("../../../utils/commonUtil");
+
+var _businessUtil = require("../../../utils/businessUtil");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+
+var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
+  var _ = {
+    label: 0,
+    sent: function sent() {
+      if (t[0] & 1) throw t[1];
+      return t[1];
+    },
+    trys: [],
+    ops: []
+  },
+      f,
+      y,
+      t,
+      g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+
+    while (_) {
+      try {
+        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+        if (y = 0, t) op = [op[0] & 2, t.value];
+
+        switch (op[0]) {
+          case 0:
+          case 1:
+            t = op;
+            break;
+
+          case 4:
+            _.label++;
+            return {
+              value: op[1],
+              done: false
+            };
+
+          case 5:
+            _.label++;
+            y = op[1];
+            op = [0];
+            continue;
+
+          case 7:
+            op = _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+
+          default:
+            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+              _ = 0;
+              continue;
+            }
+
+            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+              _.label = op[1];
+              break;
+            }
+
+            if (op[0] === 6 && _.label < t[1]) {
+              _.label = t[1];
+              t = op;
+              break;
+            }
+
+            if (t && _.label < t[2]) {
+              _.label = t[2];
+
+              _.ops.push(op);
+
+              break;
+            }
+
+            if (t[2]) _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+        }
+
+        op = body.call(thisArg, _);
+      } catch (e) {
+        op = [6, e];
+        y = 0;
+      } finally {
+        f = t = 0;
+      }
+    }
+
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+
+function StoreCatgTable(props) {
+  var _this = this;
+
+  var _onChange = props.onChange;
+
+  var _a = (0, _react.useState)([]),
+      catgList = _a[0],
+      setCatgList = _a[1];
+
+  var _b = (0, _react.useState)(false),
+      loading = _b[0],
+      setLoading = _b[1];
+
+  var queryCategory = function queryCategory() {
+    return __awaiter(_this, void 0, void 0, function () {
+      var res, tree;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            setLoading(true);
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/storeoffercatgs", {}, 'GET')];
+
+          case 1:
+            res = _a.sent();
+            tree = (0, _businessUtil.listToTree)(res, 'storeCatgId'); // console.log('res', res);
+
+            console.log('tree', tree);
+            setCatgList(tree);
+            setLoading(false);
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
+  (0, _react.useEffect)(function () {
+    queryCategory();
+  }, []);
+  var columns = [{
+    title: 'Category',
+    dataIndex: 'catgName',
+    render: function render(catgName) {
+      return /*#__PURE__*/_react["default"].createElement("span", {
+        className: "productName"
+      }, catgName);
+    }
+  }];
+  var rowSelection = {
+    onChange: function onChange(selectedRowKeys, selectedRow) {
+      _onChange({
+        value: selectedRowKeys[0],
+        name: selectedRow[0].catgName
+      });
+    },
+    type: 'radio'
+  };
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      height: 550
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
+    bordered: false,
+    columns: columns,
+    dataSource: catgList,
+    defaultExpandAllRows: true,
+    loading: loading,
+    pagination: false,
+    rowKey: function rowKey(record) {
+      return record && record.key;
+    },
+    rowSelection: rowSelection,
+    scroll: {
+      y: 480
+    }
+  }));
+}

package/lib/common/LinkModal/index.js

@@ -33,6 +33,8 @@ var _MiniAppTable = _interopRequireDefault(require("./MiniAppTable"));
 
 var _StoreTable = _interopRequireDefault(require("./StoreTable"));
 
+var _StoreCatgTable = _interopRequireDefault(require("./StoreCatgTable"));
+
 var _locale = require("../../locale");
 
 var _commonUtil = require("../../utils/commonUtil");
@@ -290,7 +292,11 @@ var LinkModal = function LinkModal(props) {
     return /*#__PURE__*/_react["default"].createElement(_antd.Tabs.TabPane, {
       key: item.linkTypeCode,
       tab: item.linkTypeName
-    }, item.linkTypeCode === 'Category' && /*#__PURE__*/_react["default"].createElement(_CatgTable["default"], {
+    }, item.linkTypeCode === 'StoreCategory' && /*#__PURE__*/_react["default"].createElement(_StoreCatgTable["default"], {
+      onChange: function onChange(value) {
+        setLinkUrl(value);
+      }
+    }), item.linkTypeCode === 'Category' && /*#__PURE__*/_react["default"].createElement(_CatgTable["default"], {
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }