@fonixtree/magic-design 1.0.5 → 1.0.7

package/lib/composite-comp/dito/components/SearchBar/pc/index.js

@@ -117,7 +117,7 @@ function (_super) {
         display: 'flex'
       },
       type: "icon-search2"
-    }))), data.content && data.content.icon.open && /*#__PURE__*/_react["default"].createElement("div", {
+    }))), data.content && data.content.icon.cartIcon.pc && /*#__PURE__*/_react["default"].createElement("div", {
       className: "shopping-wrap",
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/main/cart');
@@ -129,7 +129,7 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       color: data.content.icon.color.pc,
       size: 16,
-      type: "icon-ShoppingCartSimple"
+      type: "icon-ShoppingCartSimple1"
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: "shopping-txt"
     }, (0, _locale.i18n)('SHOPPING_CART')))), data.content && data.content.logo.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {

package/lib/composite-comp/dito/components/SignBoard/defaultJSON.js

@@ -11,43 +11,47 @@ var getDefaultJSON = function getDefaultJSON() {
   return {
     id: (0, _uuid.v4)(),
     type: 'SIGN_BOARD',
-    // content: {
-    //   logo: {
-    //     id: uuidv4(),
-    //     open: true,
-    //     type: 'IMAGE',
-    //     content: {
-    //       h5Name: 'name2',
-    //       pcName: 'name2',
-    //       h5ImgSrc: '',
-    //       pcImgSrc: '',
-    //       clickUrl: '',
-    //     },
-    //     hover: {
-    //       open: false,
-    //       backgroundType: 'enlarge',
-    //       magnification: 1.5,
-    //       pcImgHoverUrl: '',
-    //       h5ImgHoverUrl: '',
-    //     },
-    //   },
-    //   box: {
-    //     id: uuidv4(),
-    //     open: true,
-    //     color: {
-    //       pc: '#D92929',
-    //       mobile: '#8493AF',
-    //     },
-    //   },
-    //   icon: {
-    //     id: uuidv4(),
-    //     open: true,
-    //     color: {
-    //       pc: '#D92929',
-    //       mobile: '#232F46',
-    //     },
-    //   },
-    // },
+    content: {
+      logo: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'IMAGE',
+        content: {
+          h5Name: 'name2',
+          pcName: 'name2',
+          h5ImgSrc: '',
+          pcImgSrc: '',
+          clickUrl: ''
+        },
+        hover: {
+          open: false,
+          backgroundType: 'enlarge',
+          magnification: 1.5,
+          pcImgHoverUrl: '',
+          h5ImgHoverUrl: ''
+        }
+      },
+      title: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'TEXT',
+        specialContent: [],
+        text: 'Title',
+        content: {
+          sizeType: 'Customize font styles',
+          fontFamily: 'Open Sans',
+          fontWeight: 600,
+          fontSize: 16,
+          color: '#070707'
+        },
+        underline: {
+          open: false,
+          textDecorationColor: '',
+          textDecorationStyle: 'solid'
+        },
+        vertical: {}
+      }
+    },
     spacing: {
       pc: {
         paddingTop: 20,

package/lib/composite-comp/dito/components/SignBoard/mobile/index.js

@@ -13,8 +13,6 @@ var _antd = require("antd");
 
 var _common = require("../../../../../common");
 
-var _storeLogo = _interopRequireDefault(require("../imgs/storeLogo.png"));
-
 var _coreUtil = require("../../../../../utils/coreUtil");
 
 var _star = _interopRequireDefault(require("../imgs/star.svg"));
@@ -23,6 +21,8 @@ var _commonUtil = require("../../../../../utils/commonUtil");
 
 var _locale = require("../../../../../locale");
 
+var _components = require("../../../../../meta-comp/components");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -310,17 +310,21 @@ function (_super) {
 
     _this.toChat = function () {
       var storeInfo = _this.state.storeInfo; // 登录情况下，直接跳聊天页
-
-      if (localStorage.getItem('isLogin') === 'Y') {
-        (0, _commonUtil.navigateTo)("/chat/" + (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.sysAccount));
-      } else {
-        window.magicDesign.history.push({
-          pathname: '/sign-in',
-          state: {
-            redirectUrl: "/chat/" + (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.sysAccount)
-          }
-        });
-      }
+      // if (localStorage.getItem('isLogin') === 'Y') {
+      //   navigateTo(`/chat/${storeInfo?.sysAccount}`);
+      // } else {
+      //   window.magicDesign.history.push({ pathname: '/sign-in', state: { redirectUrl: `/chat/${storeInfo?.sysAccount}` } });
+      // }
+
+      var params = {
+        action: 'operation',
+        params: {
+          type: 'CHAT',
+          storeId: storeInfo.storeId,
+          sysAccount: storeInfo.sysAccount
+        }
+      };
+      window.magicDesign.handleAction(params);
     };
 
     return _this;
@@ -331,14 +335,16 @@ function (_super) {
   };
 
   SignBoardMobile.prototype.render = function () {
-    var _this = this; // const { data } = this.props;
-    // console.log('--SignBoard', data);
+    var _this = this;
+
+    var _a, _b;
 
+    var data = this.props.data; // console.log('--SignBoard', data);
 
-    var _a = this.state,
-        storeInfo = _a.storeInfo,
-        isFollow = _a.isFollow,
-        inputVal = _a.inputVal;
+    var _c = this.state,
+        storeInfo = _c.storeInfo,
+        isFollow = _c.isFollow,
+        inputVal = _c.inputVal;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-sign-board-bar"
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -363,12 +369,18 @@ function (_super) {
       type: "icon-search2"
     }))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "store-info-wrap"
-    }, /*#__PURE__*/_react["default"].createElement("img", {
-      className: "store-logo",
-      src: (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.storeLogoUrl) || _storeLogo["default"]
+    }, data.content && ((_a = data.content.logo) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "logo"
+    }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+      data: data.content.logo,
+      style: {
+        height: 44,
+        width: 44
+      }
+    })), data.content && ((_b = data.content.title) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+      className: "card-text",
+      data: data.content.title
     }), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "store-name"
-    }, (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.storeName) || 'Compraqui'), /*#__PURE__*/_react["default"].createElement("div", {
       onClick: this.clickCollect
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       color: isFollow ? '#F1600F' : '#333333',
@@ -383,7 +395,7 @@ function (_super) {
       src: _star["default"]
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "number"
-    }, /*#__PURE__*/_react["default"].createElement("span", null, (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.userCollectionNum) || '1000+', "  "), " ", (0, _locale.i18n)('FOLLOWERS')), /*#__PURE__*/_react["default"].createElement("div", {
+    }, /*#__PURE__*/_react["default"].createElement("span", null, (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.userCollectionNum) || '1000+', "  "), " ", (0, _locale.i18n)('FOLLOWERS')), (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.hasCustomerService) === 'Y' && /*#__PURE__*/_react["default"].createElement("div", {
       className: "chat-btn",
       onClick: this.toChat
     }, (0, _locale.i18n)('CHAT'))));

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

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

package/lib/composite-comp/dito/config-panels/SearchBarConfig/SearchBarConfigContent/index.js

@@ -9,6 +9,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _antd = require("antd");
+
 var _common = require("../../../../../common");
 
 var _ImageConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/ImageConfig"));
@@ -102,14 +104,14 @@ function (_super) {
       metaOption: panelProps.box,
       toggleType: 'switch'
     }, {
-      key: 'search3',
+      key: panelProps.icon.id,
       name: (0, _locale.i18n)('ICON'),
-      value: /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      toggleType: 'triangle',
+      value: /*#__PURE__*/_react["default"].createElement("div", {
         style: {
-          marginTop: 20
-        },
-        title: (0, _locale.i18n)('COLOR')
-      }, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
+          marginTop: 10
+        }
+      }, /*#__PURE__*/_react["default"].createElement(_common.Field, null, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
         colorType: "rgba",
         onChange: function onChange(v) {
           if ((0, _coreUtil.isPc)()) {
@@ -121,9 +123,37 @@ function (_super) {
           _this.selfRender();
         },
         value: (0, _coreUtil.isPc)() ? panelProps.icon.color.pc : panelProps.icon.color.mobile
-      })),
-      metaOption: panelProps.icon,
-      toggleType: 'switch'
+      })), /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          background: '#F5F6F7',
+          padding: '14px 12px 1px'
+        }
+      }, /*#__PURE__*/_react["default"].createElement(_common.Field, {
+        layout: "horizontal",
+        title: (0, _locale.i18n)('CART_ICON')
+      }, /*#__PURE__*/_react["default"].createElement(_antd.Checkbox, {
+        checked: (0, _coreUtil.isPc)() ? panelProps.icon.cartIcon.pc : panelProps.icon.cartIcon.mobile,
+        onChange: function onChange(e) {
+          if ((0, _coreUtil.isPc)()) {
+            panelProps.icon.cartIcon.pc = e.target.checked;
+          } else {
+            panelProps.icon.cartIcon.mobile = e.target.checked;
+          }
+
+          _this.selfRender();
+        }
+      })), !(0, _coreUtil.isPc)() && /*#__PURE__*/_react["default"].createElement(_common.Field, {
+        layout: "horizontal",
+        title: (0, _locale.i18n)('MESSAGE_ICON')
+      }, /*#__PURE__*/_react["default"].createElement(_antd.Checkbox, {
+        checked: panelProps.icon.messageIcon.mobile,
+        onChange: function onChange(e) {
+          panelProps.icon.messageIcon.mobile = e.target.checked;
+
+          _this.selfRender();
+        }
+      })))),
+      metaOption: panelProps.icon
     }];
     return /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
       headerSize: "middle",

package/lib/composite-comp/dito/config-panels/SignBoardConfig/SignBoardConfigContent/index.js

@@ -15,6 +15,8 @@ var _ImageConfig = _interopRequireDefault(require("../../../../../meta-comp/conf
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 
+var _TextConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/TextConfig"));
+
 var _locale = require("../../../../../locale");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -67,11 +69,9 @@ function (_super) {
   }
 
   SignBoardConfigContent.prototype.render = function () {
-    var _this = this;
-
     var panelProps = this.props.panelProps;
     var source = [{
-      key: 'search1',
+      key: 'logo',
       name: (0, _locale.i18n)('LOGO'),
       value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
         data: panelProps.logo
@@ -79,50 +79,12 @@ function (_super) {
       metaOption: panelProps.logo,
       toggleType: 'switch'
     }, {
-      key: 'search2',
-      name: (0, _locale.i18n)('SEARCH_BOX'),
-      value: /*#__PURE__*/_react["default"].createElement(_common.Field, {
-        style: {
-          marginTop: 20
-        },
-        title: (0, _locale.i18n)('COLOR')
-      }, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
-        colorType: "rgba",
-        onChange: function onChange(v) {
-          if ((0, _coreUtil.isPc)()) {
-            panelProps.box.color.pc = v;
-          } else {
-            panelProps.box.color.mobile = v;
-          }
-
-          _this.selfRender();
-        },
-        value: (0, _coreUtil.isPc)() ? panelProps.box.color.pc : panelProps.box.color.mobile
-      })),
-      metaOption: panelProps.box,
-      toggleType: 'switch'
-    }, {
-      key: 'search3',
-      name: (0, _locale.i18n)('ICON'),
-      value: /*#__PURE__*/_react["default"].createElement(_common.Field, {
-        style: {
-          marginTop: 20
-        },
-        title: (0, _locale.i18n)('COLOR')
-      }, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
-        colorType: "rgba",
-        onChange: function onChange(v) {
-          if ((0, _coreUtil.isPc)()) {
-            panelProps.icon.color.pc = v;
-          } else {
-            panelProps.icon.color.mobile = v;
-          }
-
-          _this.selfRender();
-        },
-        value: (0, _coreUtil.isPc)() ? panelProps.icon.color.pc : panelProps.icon.color.mobile
-      })),
-      metaOption: panelProps.icon,
+      key: 'title',
+      name: (0, _locale.i18n)('TITLE'),
+      value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
+        data: panelProps.title
+      }),
+      metaOption: panelProps.title,
       toggleType: 'switch'
     }];
     return /*#__PURE__*/_react["default"].createElement(_common.Collapse, {

package/lib/composite-comp/dito/config-panels/SignBoardConfig/index.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _SignBoardConfigContent = _interopRequireDefault(require("./SignBoardConfigContent"));
+
 var _locale = require("../../../../locale");
 
 var _common = require("../../../../common");
@@ -57,8 +59,13 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
       divider: "bold",
       headerSize: "large",
-      source: [// { key: 'signBoard1', name: i18n('CONTENT'), value: <SignBoardConfigContent panelProps={data.content} /> },
-      {
+      source: [{
+        key: 'signBoard1',
+        name: (0, _locale.i18n)('CONTENT'),
+        value: /*#__PURE__*/_react["default"].createElement(_SignBoardConfigContent["default"], {
+          panelProps: data.content
+        })
+      }, {
         key: 'signBoard4',
         name: (0, _locale.i18n)('SPACING'),
         value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {

package/lib/composite-comp/dito/second-config-panels/MobileNavigationSecondConfig/index.js

@@ -55,13 +55,80 @@ function (_super) {
 
     _this.state = {};
 
+    _this.getImageRecommendSize = function (customize) {
+      var obj = null;
+
+      switch (customize === null || customize === void 0 ? void 0 : customize.layout) {
+        case 'newline':
+          switch (customize === null || customize === void 0 ? void 0 : customize.rowNum) {
+            case 5:
+              obj = {
+                width: 48,
+                height: 48
+              };
+              break;
+
+            case 4:
+              obj = {
+                width: 52,
+                height: 52
+              };
+              break;
+
+            case 3:
+              obj = {
+                width: 82,
+                height: 82
+              };
+              break;
+          }
+
+          break;
+
+        case 'tile':
+          {
+            switch (customize === null || customize === void 0 ? void 0 : customize.rowNum) {
+              case 5:
+                obj = {
+                  width: 44,
+                  height: 44
+                };
+                break;
+
+              case 4:
+                obj = {
+                  width: 52,
+                  height: 52
+                };
+                break;
+
+              case 3:
+                obj = {
+                  width: 78,
+                  height: 78
+                };
+                break;
+            }
+
+            break;
+          }
+      }
+
+      return obj;
+    };
+
     _this.getContentPanel = function (data, needHover) {
+      var parentNode = _this.props.parentNode;
+
+      var size = _this.getImageRecommendSize(parentNode.customize);
+
       var source = [{
         key: 'mobileNavSecondContent1',
         name: (0, _locale.i18n)('IMAGE'),
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: data.image,
-          needHover: needHover
+          needHover: needHover,
+          recommendImgSize: size
         }),
         metaOption: data.image
       }, {

package/lib/composite-comp/dito/second-config-panels/RecommendSecondConfig/AIRecommendation/index.js

@@ -275,7 +275,7 @@ function (_super) {
               ];
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/brands/list", {}, 'GET')];
+              , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/designer/resource/brand/list")];
 
             case 3:
               res = _a.sent();