@fonixtree/magic-design 0.1.27 → 0.1.29

package/es/composite-comp/dito/components/SignBoard/pc/index.js

@@ -21,6 +21,8 @@ var _defaultImg = _interopRequireDefault(require("../../../../../common/GroupLis
 
 var _logo = _interopRequireDefault(require("../imgs/logo.png"));
 
+var _commonUtil = require("../../../../../utils/commonUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -49,6 +51,149 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
+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 SignBoardPc =
 /** @class */
 function (_super) {
@@ -58,7 +203,98 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {
-      inputVal: ''
+      inputVal: '',
+      storeInfo: null,
+      isFollow: false
+    };
+
+    _this.getStoreInfo = function () {
+      return __awaiter(_this, void 0, void 0, function () {
+        var storeId, res, isFollow;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
+            case 0:
+              storeId = window.magicDesign.storeId;
+              if (!storeId) return [3
+              /*break*/
+              , 3];
+              return [4
+              /*yield*/
+              , (0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET')];
+
+            case 1:
+              res = _a.sent();
+              return [4
+              /*yield*/
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/collection/store/check', {
+                storeId: storeId
+              })];
+
+            case 2:
+              isFollow = _a.sent();
+              console.log('---d', res);
+              this.setState({
+                storeInfo: res,
+                isFollow: isFollow
+              });
+              _a.label = 3;
+
+            case 3:
+              return [2
+              /*return*/
+              ];
+          }
+        });
+      });
+    };
+
+    _this.clickCollect = function () {
+      return __awaiter(_this, void 0, void 0, function () {
+        var storeId, isFollow, error_1;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
+            case 0:
+              storeId = window.magicDesign.storeId;
+              isFollow = this.state.isFollow;
+              if (!storeId) return [3
+              /*break*/
+              , 4];
+              _a.label = 1;
+
+            case 1:
+              _a.trys.push([1, 3,, 4]);
+
+              return [4
+              /*yield*/
+              , (0, _commonUtil.commonFetch)('/h5/collection/store', {
+                storeId: storeId,
+                operationType: !isFollow ? 'D' : 'A'
+              }, 'post')];
+
+            case 2:
+              _a.sent();
+
+              this.setState({
+                isFollow: !isFollow
+              });
+              return [3
+              /*break*/
+              , 4];
+
+            case 3:
+              error_1 = _a.sent();
+              console.log(error_1);
+              return [3
+              /*break*/
+              , 4];
+
+            case 4:
+              return [2
+              /*return*/
+              ];
+          }
+        });
+      });
     };
 
     _this.onChangeVal = function (val) {
@@ -68,8 +304,9 @@ function (_super) {
     };
 
     _this.searchProduct = function () {
-      console.log('--input', _this.state.inputVal);
-      (0, _coreUtil.clickUrl)("/product/list?q=" + _this.state.inputVal);
+      // console.log('--input', this.state.inputVal);
+      var storeId = window.magicDesign.storeId;
+      (0, _coreUtil.clickUrl)("/product/list?q=" + _this.state.inputVal + "&storeId=" + storeId);
     };
 
     _this.keyUp = function (e) {
@@ -81,14 +318,19 @@ function (_super) {
     return _this;
   }
 
-  SignBoardPc.prototype.componentDidMount = function () {};
+  SignBoardPc.prototype.componentDidMount = function () {
+    this.getStoreInfo();
+  };
 
   SignBoardPc.prototype.render = function () {
     var _this = this;
 
     var data = this.props.data;
-    var inputVal = this.state.inputVal;
-    console.log('--pc data', data);
+    console.log('--SignBoardPc data', data);
+    var _a = this.state,
+        storeInfo = _a.storeInfo,
+        isFollow = _a.isFollow,
+        inputVal = _a.inputVal;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "pc-sign-board-bar"
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -139,18 +381,22 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement("img", {
       alt: "logo",
       className: "store-logo",
-      src: _defaultImg["default"]
+      src: (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.storeLogoUrl) || _defaultImg["default"]
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "info"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "store-name"
-    }, "Whale Store"), /*#__PURE__*/_react["default"].createElement("div", {
+    }, (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.storeName) || 'Whale Store'), /*#__PURE__*/_react["default"].createElement("div", {
       className: "store-number"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "store-number-item"
-    }, "Positive:", /*#__PURE__*/_react["default"].createElement("span", null, "8")), /*#__PURE__*/_react["default"].createElement("div", {
+    }, "Positive:", /*#__PURE__*/_react["default"].createElement("span", null, (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.storeEvalValue) || '98%', " ")), /*#__PURE__*/_react["default"].createElement("div", {
       className: "store-number-item"
-    }, "Followers:", /*#__PURE__*/_react["default"].createElement("span", null, "225")))), /*#__PURE__*/_react["default"].createElement("div", {
+    }, "Followers:", /*#__PURE__*/_react["default"].createElement("span", null, (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.userCollectionNum) || '1000+')))), /*#__PURE__*/_react["default"].createElement("div", {
+      onClick: this.clickCollect
+    }, isFollow ? /*#__PURE__*/_react["default"].createElement("div", {
+      className: "followed"
+    }, "Following") : /*#__PURE__*/_react["default"].createElement("div", {
       className: "follow"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       color: "#0D52D6",
@@ -158,7 +404,7 @@ function (_super) {
       type: "icon-add"
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: "txt"
-    }, "Follow")))));
+    }, "Follow"))))));
   };
 
   SignBoardPc.defaultProps = {

package/es/composite-comp/dito/components/SignBoard/pc/index.less

@@ -134,6 +134,18 @@
           margin-left: 8px;
         }
       }
+      .followed {
+        width: fit-content;
+        border: 1px solid #E0E0E0;
+        border-radius: 8px;
+        padding: 12px 16px;
+        font-family: 'Montserrat';
+        font-style: normal;
+        font-weight: 400;
+        font-size: 14px;
+        line-height: 18px;
+        color: rgba(51, 51, 51, 0.65);
+      }
     }
   }
 }

package/es/constants/index.js

@@ -55,7 +55,8 @@ var urlTypeMap = {
   BUNDLE_CAMPAIGN: 'BundleCampaign',
   VIDEO: 'Video',
   SHARE_URL: 'ShareURL',
-  MINI_APP: 'MiniApp'
+  MINI_APP: 'MiniApp',
+  STORE: 'Store'
 };
 exports.urlTypeMap = urlTypeMap;
 var respCodeMap = {

package/es/utils/businessUtil.js

@@ -123,6 +123,18 @@ var newParseUrl = function newParseUrl(urlObj) {
       };
       break;
 
+    case _constants.urlTypeMap.STORE:
+      // 跳转店铺
+      link = "/store-home/" + value;
+      params = {
+        action: 'jump',
+        params: {
+          type: 'STORE',
+          url: value
+        }
+      };
+      break;
+
     default:
       var map = {
         '/main/cart': 'CART',

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

@@ -247,8 +247,8 @@ function StoreTable(props) {
   var rowSelection = {
     onChange: function onChange(selectedRowKeys, selectedRow) {
       _onChange({
-        value: selectedRowKeys[0],
-        name: selectedRow[0].catgName
+        value: selectedRow[0].storeId,
+        name: selectedRow[0].storeName
       });
     },
     type: 'radio'
@@ -309,9 +309,7 @@ function StoreTable(props) {
       },
       showSizeChanger: false
     }),
-    rowKey: function rowKey(record) {
-      return record && record.key;
-    },
+    rowKey: "storeId",
     rowSelection: rowSelection,
     scroll: {
       y: 400

package/lib/composite-comp/bol/components/Text/index.js

@@ -98,7 +98,7 @@ function (_super) {
       moduleName: nodeData.moduleIndex + '.' + nodeData.type
     };
     var groupWrapContainerStyle = window.magicDesign.device === 'pc' ? 'padding: 16px 20px;' : 'padding: 12px 20px;';
-    var style = ".m-text{display: flex;flex-direction: column;}.m-text .title-wrap{font-weight:500;font-size:20px;}.m-text .sub-title-text{font-size:15px;color:#b7b7b7;margin-top:10px;}.m-text .group-content-wrap{width:100%;}.m-text .group-content-wrap .group-wrap-container{" + groupWrapContainerStyle + "}.m-text .group-content-wrap .group-wrap{display:flex;flex-direction:column;width:100%;}.m-text .group-content-wrap .group-wrap .group-title{font-size:14px;}.m-text .group-content-wrap.col-1 .group-wrap{width:100%;}.m-text .group-content-wrap.col-2{display:grid;grid-template-columns:50% 50%;}.m-text .group-content-wrap.col-3{display:grid;grid-template-columns:33.3% 33.3% 33.3%;}.m-text .group-content-wrap.mobile{display:block;}";
+    var style = ".m-text{display: flex;flex-direction: column;word-break: break-word;}.m-text .title-wrap{font-weight:500;font-size:20px;}.m-text .sub-title-text{font-size:15px;color:#b7b7b7;margin-top:10px;}.m-text .group-content-wrap{width:100%;}.m-text .group-content-wrap .group-wrap-container{" + groupWrapContainerStyle + "}.m-text .group-content-wrap .group-wrap{display:flex;flex-direction:column;width:100%;}.m-text .group-content-wrap .group-wrap .group-title{font-size:14px;}.m-text .group-content-wrap.col-1 .group-wrap{width:100%;}.m-text .group-content-wrap.col-2{display:grid;grid-template-columns:50% 50%;}.m-text .group-content-wrap.col-3{display:grid;grid-template-columns:33.3% 33.3% 33.3%;}.m-text .group-content-wrap.mobile{display:block;}";
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-text",
       onClick: this.onComponentClick

package/lib/composite-comp/bol/components/Text/index.less

@@ -1,6 +1,7 @@
 .m-text {
   display: flex;
   flex-direction: column;
+  word-break: break-word;
 
   .title-wrap {
     font-weight: 500;

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

@@ -11,43 +11,43 @@ var getDefaultJSON = function getDefaultJSON() {
   return {
     id: (0, _uuid.v4)(),
     type: 'SIGN_BOARD',
-    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: ''
-        }
-      },
-      box: {
-        id: (0, _uuid.v4)(),
-        open: true,
-        color: {
-          pc: '#D92929',
-          mobile: '#8493AF'
-        }
-      },
-      icon: {
-        id: (0, _uuid.v4)(),
-        open: true,
-        color: {
-          pc: '#D92929',
-          mobile: '#232F46'
-        }
-      }
-    },
+    // 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',
+    //     },
+    //   },
+    // },
     spacing: {
       pc: {
         paddingTop: 20,
@@ -63,10 +63,10 @@ var getDefaultJSON = function getDefaultJSON() {
         marginBottom: window.magicDesign.compSpacing
       }
     },
-    customize: {
-      layout: 'left',
-      align: 'left'
-    },
+    // customize: {
+    //   layout: 'left',
+    //   align: 'left',
+    // },
     background: {
       opacity: 100,
       color: '#fff',