@fonixtree/magic-design 1.0.67 → 1.0.69

package/es/composite-comp/dito/components/Recommend/mobile/index.js

@@ -262,7 +262,7 @@ function (_super) {
     _this.preContent = '';
     _this.preSpacing = '';
     _this._cache = (0, _coreUtil.isDesignMode)() ? {} : (0, _commonUtil.ensure)(function () {
-      return (0, _storeUtil.getMagicStore)("recommend_" + _this.props.panelProps.id);
+      return (0, _storeUtil.getMagicStore)("recommend_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
     }, {});
     _this.state = __assign({
       contentWidth: 0,
@@ -308,7 +308,7 @@ function (_super) {
 
     _this.getProductList = function (index) {
       return __awaiter(_this, void 0, void 0, function () {
-        var panelProps, groupSource, recommendId, cache, _a, _b, sourceType, _c, prodIds, _d, prodType, _e, intelligentType, _f, intelligentValue, _g, maxProdNum, newData, params, res, res, e_1, _cache;
+        var panelProps, groupSource, recommendId, pageId, cache, _a, _b, sourceType, _c, prodIds, _d, prodType, _e, intelligentType, _f, intelligentValue, _g, maxProdNum, newData, params, res, res, e_1, _cache;
 
         var _h, _j, _k;
 
@@ -320,9 +320,10 @@ function (_super) {
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
               recommendId = panelProps.id;
+              pageId = window.magicDesign.pageId || '';
 
               if (!(0, _coreUtil.isDesignMode)()) {
-                cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
+                cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
 
                 if (cache) {
                   if ("products" + index in cache) {
@@ -425,8 +426,8 @@ function (_super) {
 
             case 10:
               if (!(0, _coreUtil.isDesignMode)()) {
-                _cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
-                (0, _storeUtil.setMagicStore)("recommend_" + recommendId, __assign(__assign({}, _cache), (_j = {}, _j["products" + index] = newData, _j.endTime = Date.now() + 3 * 60 * 1000, _j)));
+                _cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
+                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_j = {}, _j["products" + index] = newData, _j.endTime = Date.now() + 3 * 60 * 1000, _j)));
               }
 
               this.setState((_k = {}, _k["products" + index] = newData, _k), function () {

package/es/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/es/composite-comp/dito/components/Recommend/pc/index.js

@@ -245,7 +245,7 @@ function (_super) {
     _this.preContent = '';
     _this.preSpacing = '';
     _this._cache = (0, _coreUtil.isDesignMode)() ? {} : (0, _commonUtil.ensure)(function () {
-      return (0, _storeUtil.getMagicStore)("recommend_" + _this.props.panelProps.id);
+      return (0, _storeUtil.getMagicStore)("recommend_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
     }, {});
     _this.scrollRef = /*#__PURE__*/_react["default"].createRef();
     _this.state = __assign({
@@ -303,7 +303,7 @@ function (_super) {
 
     _this.getProductList = function (index) {
       return __awaiter(_this, void 0, void 0, function () {
-        var panelProps, groupSource, recommendId, cache, _a, _b, sourceType, _c, prodIds, _d, intelligentType, _e, intelligentValue, _f, maxProdNum, newData, res, res, e_1, _cache;
+        var panelProps, groupSource, recommendId, pageId, cache, _a, _b, sourceType, _c, prodIds, _d, intelligentType, _e, intelligentValue, _f, maxProdNum, newData, res, res, e_1, _cache;
 
         var _g, _h, _j;
 
@@ -315,9 +315,10 @@ function (_super) {
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
               recommendId = panelProps.id;
+              pageId = window.magicDesign.pageId || '';
 
               if (!(0, _coreUtil.isDesignMode)()) {
-                cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
+                cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
 
                 if (cache) {
                   if ("products" + index in cache) {
@@ -417,8 +418,8 @@ function (_super) {
 
             case 10:
               if (!(0, _coreUtil.isDesignMode)()) {
-                _cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
-                (0, _storeUtil.setMagicStore)("recommend_" + recommendId, __assign(__assign({}, _cache), (_h = {}, _h["products" + index] = newData, _h.endTime = Date.now() + 3 * 60 * 1000, _h)));
+                _cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
+                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_h = {}, _h["products" + index] = newData, _h.endTime = Date.now() + 3 * 60 * 1000, _h)));
               }
 
               this.setState((_j = {}, _j["products" + index] = newData, _j), function () {

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.js

@@ -13,6 +13,8 @@ var _antd = require("antd");
 
 var _common = require("../../../../../common");
 
+var _coreUtil = require("../../../../../utils/coreUtil");
+
 var _star = _interopRequireDefault(require("../imgs/star.svg"));
 
 var _commonUtil = require("../../../../../utils/commonUtil");
@@ -238,13 +240,8 @@ function (_super) {
     };
 
     _this.searchProduct = function () {
-      var storeId = window.magicDesign.storeId; // 只读模式，设计模式，url为空，邮箱模版
-
-      if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || window.magicDesign.outputType == 'html') {
-        return;
-      }
-
-      (0, _commonUtil.navigateToWithSearch)('/product/list', "q=" + _this.state.inputVal + "&storeId=" + storeId); // clickUrl(`/product/list?q=${this.state.inputVal}&storeId=${storeId}`);
+      var storeId = window.magicDesign.storeId;
+      (0, _coreUtil.clickUrl)("/product/list?q=" + _this.state.inputVal + "&storeId=" + storeId);
     };
 
     _this.clickCollect = function () {
@@ -383,14 +380,14 @@ function (_super) {
     }), /*#__PURE__*/_react["default"].createElement("div", {
       onClick: this.clickCollect
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: isFollow ? '#fe1559' : '#333333',
+      color: isFollow ? '#F1600F' : '#333333',
       size: (0, _commonUtil.convertToRem)(24),
       type: isFollow ? 'icon-HeartStraight_fill' : 'icon-HeartStraight'
     }))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "store-info-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "number"
-    }, /*#__PURE__*/_react["default"].createElement("span", null, (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.storeEvalValue) ? Number(storeInfo.storeEvalValue / 100).toFixed(1) : '5.0', "  "), /*#__PURE__*/_react["default"].createElement("img", {
+    }, /*#__PURE__*/_react["default"].createElement("span", null, (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.storeEvalValue) ? Number(storeInfo.storeEvalValue / 100).toFixed(1) : '5。0', "  "), /*#__PURE__*/_react["default"].createElement("img", {
       alt: "star",
       src: _star["default"]
     })), /*#__PURE__*/_react["default"].createElement("div", {

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/composite-comp/dito/config-panels/AffiliateRecommendConfig/RecommendConfigContent/index.js

@@ -0,0 +1,102 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _TextConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/TextConfig"));
+
+var _coreUtil = require("../../../../../utils/coreUtil");
+
+var _common = require("../../../../../common");
+
+var _locale = require("../../../../../locale");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var AComponent =
+/** @class */
+function (_super) {
+  __extends(AComponent, _super);
+
+  function AComponent() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.state = {};
+
+    _this.reRender = function () {
+      (0, _coreUtil.renderPreview)();
+
+      _this.setState({});
+    };
+
+    return _this;
+  }
+
+  AComponent.prototype.render = function () {
+    var panelProps = this.props.panelProps;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "recommend_content"
+    }, /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
+      headerSize: "middle",
+      onRefresh: this.reRender,
+      source: [{
+        key: panelProps.productName.id,
+        name: (0, _locale.i18n)('PRODUCT_NAME'),
+        value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
+          data: panelProps.productName
+        }),
+        metaOption: panelProps.productName
+      }, {
+        key: panelProps.salesPrice.id,
+        name: (0, _locale.i18n)('SALES_PRICE'),
+        value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
+          data: panelProps.salesPrice
+        }),
+        metaOption: panelProps.salesPrice
+      }],
+      type: "switch"
+    }));
+  };
+
+  AComponent.defaultProps = {
+    panelProps: {
+      sortType: '1',
+      productName: {},
+      salesPrice: {}
+    }
+  };
+  return AComponent;
+}(_react["default"].Component);
+
+var _default = AComponent;
+exports["default"] = _default;