@fonixtree/magic-design 0.1.25 → 0.1.26

package/es/common/LinkModal/FunctionTable/index.js

@@ -196,7 +196,9 @@ function FunctionTable(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/pages/functions", {}, 'GET')];
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/pages/functions", {
+              partyType: window.magicDesign.partyType
+            }, 'GET')];
 
           case 1:
             res = _a.sent();

package/es/common/LinkModal/StoreTable/index.js

@@ -0,0 +1,314 @@
+"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"] = StoreTable;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _antd = require("antd");
+
+var _commonUtil = require("../../../utils/commonUtil");
+
+var _locale = require("../../../locale");
+
+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 __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
+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
+    };
+  }
+};
+
+var paginationParams = {
+  pageSize: 20,
+  pageIndex: 1
+};
+
+function StoreTable(props) {
+  var _this = this;
+
+  var _onChange = props.onChange;
+
+  var _a = (0, _react.useState)([]),
+      storeList = _a[0],
+      setStoreList = _a[1];
+
+  var _b = (0, _react.useState)(false),
+      loading = _b[0],
+      setLoading = _b[1];
+
+  var _c = (0, _react.useState)(''),
+      storeName = _c[0],
+      setStoreName = _c[1];
+
+  var queryStore = function queryStore(params) {
+    return __awaiter(_this, void 0, void 0, function () {
+      var res;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            setLoading(true);
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/offercatgs/list", params, 'GET')];
+
+          case 1:
+            res = _a.sent();
+            setStoreList(res.list);
+            setLoading(false);
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
+  (0, _react.useEffect)(function () {
+    queryStore(paginationParams);
+  }, []);
+  var columns = [{
+    title: 'Logo',
+    dataIndex: 'catgName',
+    render: function render(catgName) {
+      return /*#__PURE__*/_react["default"].createElement("span", {
+        className: "productName"
+      }, catgName);
+    }
+  }, {
+    title: 'StoreName',
+    dataIndex: 'storeName'
+  }];
+  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.Form, {
+    labelCol: {
+      span: 4
+    },
+    layout: "horizontal"
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Row, {
+    gutter: 24
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    span: 12
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
+    label: "Store"
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
+    onChange: function onChange(e) {
+      return setStoreName(e.target.value);
+    },
+    size: "small",
+    value: storeName
+  }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    span: 6
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
+    onClick: function onClick() {
+      setLoading(true);
+      paginationParams.pageIndex = 1;
+      queryGoods(__assign({
+        storeName: storeName
+      }, paginationParams));
+    },
+    size: "small",
+    style: {
+      marginRight: 10
+    },
+    type: "primary"
+  }, (0, _locale.i18n)('QUERY')), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
+    onClick: function onClick() {
+      reset();
+    },
+    size: "small"
+  }, (0, _locale.i18n)('CANCEL'))))), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
+    bordered: false,
+    columns: columns,
+    dataSource: storeList,
+    defaultExpandAllRows: true,
+    loading: loading,
+    pagination: __assign(__assign({}, paginationParams), {
+      onChange: function onChange(page) {
+        paginationParams.pageIndex = page;
+        queryStore(__assign(__assign({}, paginationParams), {
+          storeName: storeName
+        }));
+      },
+      showSizeChanger: false
+    }),
+    rowKey: function rowKey(record) {
+      return record && record.key;
+    },
+    rowSelection: rowSelection,
+    scroll: {
+      y: 440
+    }
+  }));
+}

package/es/common/LinkModal/index.js

@@ -31,6 +31,8 @@ var _ShareUrl = _interopRequireDefault(require("./ShareUrl"));
 
 var _MiniAppTable = _interopRequireDefault(require("./MiniAppTable"));
 
+var _StoreTable = _interopRequireDefault(require("./StoreTable"));
+
 var _locale = require("../../locale");
 
 var _commonUtil = require("../../utils/commonUtil");
@@ -231,7 +233,9 @@ var LinkModal = function LinkModal(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)('/designer/v1/linktypes')];
+            , (0, _commonUtil.commonFetch)('/designer/v1/linktypes', {
+              partyType: window.magicDesign.partyType
+            })];
 
           case 1:
             types = _a.sent();
@@ -327,6 +331,10 @@ var LinkModal = function LinkModal(props) {
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
+    }), item.linkTypeCode === 'Store' && /*#__PURE__*/_react["default"].createElement(_StoreTable["default"], {
+      onChange: function onChange(value) {
+        return setLinkUrl(value);
+      }
     }));
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "footer"

package/es/composite-comp/bol/components/Banner/mobile/index.js

@@ -251,6 +251,7 @@ function (_super) {
       className: "swiper-ban"
     }, data.groupSource.length > 1 && data.groupSource.map(function (item, i) {
       return /*#__PURE__*/_react["default"].createElement("div", {
+        key: (item === null || item === void 0 ? void 0 : item.id) || i,
         className: (0, _classnames["default"])('ban', {
           active: i == carouseIndex
         }),

package/es/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;
+      }
+    }
+  }
+}

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

@@ -1,84 +1,103 @@
 .m-carousel-mobile {
   position: relative;
   width: 100%;
-}
-.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;
-}
+
+  .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;
+      }
+    }
+  }
+}