@fonixtree/magic-design 1.0.9 → 1.0.11

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

@@ -208,6 +208,12 @@ function (_super) {
         style: _this.getBackgroundStyle(item)
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "carouselItem",
+        onClick: function onClick() {
+          /** PTO 定制GA */
+          if (window.magicDesign.pushGA) {
+            window.magicDesign.pushGA({}, 'select_promotion');
+          }
+        },
         onMouseEnter: _this.mouseEnterWrap,
         onMouseLeave: _this.mouseLeaveWrap,
         style: _this.getItemStyle(item)

package/es/composite-comp/common/components/ProductItem/index.js

@@ -226,7 +226,9 @@ function (_super) {
       style: {
         width: salePercent + "%"
       }
-    })))));
+    }))), !showProgress && data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "sold-count"
+    }, (0, _commonUtil.convertCount)(data.salesCnt), " sold")));
   };
 
   ProductItem.defaultProps = {

package/es/composite-comp/common/components/ProductItem/index.less

@@ -5,6 +5,15 @@
   border: 1px solid #D2D9E5;
   width: 142px;
   cursor: pointer;
+  position: relative;
+
+  .sold-count {
+    color: #7b7b7b;
+    font-size: 12px;
+    position: absolute;
+    right: 8px;
+    bottom: 8px;
+  }
 
   .img-wrap {
     position: relative;

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

@@ -635,7 +635,14 @@ function (_super) {
         layout: layout === 'layout2' ? 'horizontal' : 'vertical' // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId || item.productId || ''}`)}
         ,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
+          /** PTO 定制GA */
+          if (window.magicDesign.pushGA) {
+            window.magicDesign.pushGA(item, 'select_item', {
+              event_action: 'Select Item'
+            });
+          }
+
+          (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
         showProgress: false
@@ -661,7 +668,12 @@ function (_super) {
         imgWidth: imgWidth // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId || item.productId || ''}`)}
         ,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
+          /** PTO 定制GA */
+          if (window.magicDesign.pushGA) {
+            window.magicDesign.pushGA({}, 'select_item', item);
+          }
+
+          (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
         showProgress: false

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

@@ -210,10 +210,9 @@ function (_super) {
 
     _this.getStoreInfo = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var storeId, _a, res, isFollow;
-
-        return __generator(this, function (_b) {
-          switch (_b.label) {
+        var storeId, storeDetailInfo;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
             case 0:
               storeId = window.magicDesign.storeId;
               if (!storeId) return [3
@@ -221,17 +220,15 @@ function (_super) {
               , 2];
               return [4
               /*yield*/
-              , Promise.all([(0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET'), (0, _commonUtil.commonFetch)('/designer/v1/h5/collection/store/check', {
-                storeId: storeId
-              })])];
+              , (0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET')];
 
             case 1:
-              _a = _b.sent(), res = _a[0], isFollow = _a[1];
+              storeDetailInfo = _a.sent();
               this.setState({
-                storeInfo: res,
-                isFollow: isFollow == 'Y'
+                storeInfo: storeDetailInfo,
+                isFollow: storeDetailInfo.userHasFollowed == 'Y'
               });
-              _b.label = 2;
+              _a.label = 2;
 
             case 2:
               return [2
@@ -320,8 +317,8 @@ function (_super) {
         action: 'operation',
         params: {
           type: 'CHAT',
-          storeId: storeInfo.storeId,
-          sysAccount: storeInfo.sysAccount
+          storeId: storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.storeId,
+          sysAccount: storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.sysAccount
         }
       };
       window.magicDesign.handleAction(params);

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

@@ -212,10 +212,9 @@ function (_super) {
 
     _this.getStoreInfo = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var storeId, _a, res, isFollow;
-
-        return __generator(this, function (_b) {
-          switch (_b.label) {
+        var storeId, storeDetailInfo;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
             case 0:
               storeId = window.magicDesign.storeId;
               if (!storeId) return [3
@@ -223,17 +222,15 @@ function (_super) {
               , 2];
               return [4
               /*yield*/
-              , Promise.all([(0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET'), (0, _commonUtil.commonFetch)('/designer/v1/h5/collection/store/check', {
-                storeId: storeId
-              })])];
+              , (0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET')];
 
             case 1:
-              _a = _b.sent(), res = _a[0], isFollow = _a[1];
+              storeDetailInfo = _a.sent();
               this.setState({
-                storeInfo: res,
-                isFollow: isFollow == 'Y'
+                storeInfo: storeDetailInfo,
+                isFollow: storeDetailInfo.userHasFollowed == 'Y'
               });
-              _b.label = 2;
+              _a.label = 2;
 
             case 2:
               return [2

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

@@ -81,6 +81,18 @@ function (_super) {
 
     _this.state = {};
 
+    _this.hasSource = function (type) {
+      if (!window.systemParams || !window.systemParams.recommendSource) {
+        return true;
+      }
+
+      if (window.systemParams.recommendSource && window.systemParams.recommendSource.includes(type)) {
+        return true;
+      }
+
+      return false;
+    };
+
     _this.getContentPanel = function () {
       var panelProps = _this.props.panelProps;
 
@@ -95,9 +107,9 @@ function (_super) {
           _this.selfRender();
         },
         value: panelProps.sourceType
-      }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      }, _this.hasSource('P') && /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: "select"
-      }, (0, _locale.i18n)('SELECT_PRODUCT')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      }, (0, _locale.i18n)('SELECT_PRODUCT')), _this.hasSource('A') && /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: "recommend"
       }, (0, _locale.i18n)('AI_RECOMMENDATION')))), /*#__PURE__*/_react["default"].createElement("div", {
         className: "greyBg"

package/es/utils/commonUtil.js

@@ -7,7 +7,7 @@ exports.addZero = exports.addUrlQuery = void 0;
 exports.asyncDataURLtoImage = asyncDataURLtoImage;
 exports.checkFileName = exports.calcLastTime = exports.asyncNextTick = void 0;
 exports.commonFetch = commonFetch;
-exports.compatibleNewPageData = void 0;
+exports.convertCount = exports.compatibleNewPageData = void 0;
 exports.convertImageUrl = convertImageUrl;
 exports.convertToRem = void 0;
 exports.copy2ClipBoard = copy2ClipBoard;
@@ -884,4 +884,18 @@ var downloadBase64Image = function downloadBase64Image(base64String, filename) {
   link.click();
 };
 
-exports.downloadBase64Image = downloadBase64Image;
+exports.downloadBase64Image = downloadBase64Image;
+
+var convertCount = function convertCount(value) {
+  var newValue = value;
+
+  if (value >= 1000000) {
+    newValue = Number(value / 1000000).toFixed(1) + "M";
+  } else if (value >= 1000) {
+    newValue = Number(value / 1000).toFixed(1) + "K";
+  }
+
+  return newValue;
+};
+
+exports.convertCount = convertCount;

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

@@ -208,6 +208,12 @@ function (_super) {
         style: _this.getBackgroundStyle(item)
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "carouselItem",
+        onClick: function onClick() {
+          /** PTO 定制GA */
+          if (window.magicDesign.pushGA) {
+            window.magicDesign.pushGA({}, 'select_promotion');
+          }
+        },
         onMouseEnter: _this.mouseEnterWrap,
         onMouseLeave: _this.mouseLeaveWrap,
         style: _this.getItemStyle(item)

package/lib/composite-comp/common/components/ProductItem/index.js

@@ -226,7 +226,9 @@ function (_super) {
       style: {
         width: salePercent + "%"
       }
-    })))));
+    }))), !showProgress && data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "sold-count"
+    }, (0, _commonUtil.convertCount)(data.salesCnt), " sold")));
   };
 
   ProductItem.defaultProps = {

package/lib/composite-comp/common/components/ProductItem/index.less

@@ -5,6 +5,15 @@
   border: 1px solid #D2D9E5;
   width: 142px;
   cursor: pointer;
+  position: relative;
+
+  .sold-count {
+    color: #7b7b7b;
+    font-size: 12px;
+    position: absolute;
+    right: 8px;
+    bottom: 8px;
+  }
 
   .img-wrap {
     position: relative;

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

@@ -635,7 +635,14 @@ function (_super) {
         layout: layout === 'layout2' ? 'horizontal' : 'vertical' // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId || item.productId || ''}`)}
         ,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
+          /** PTO 定制GA */
+          if (window.magicDesign.pushGA) {
+            window.magicDesign.pushGA(item, 'select_item', {
+              event_action: 'Select Item'
+            });
+          }
+
+          (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
         showProgress: false
@@ -661,7 +668,12 @@ function (_super) {
         imgWidth: imgWidth // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId || item.productId || ''}`)}
         ,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
+          /** PTO 定制GA */
+          if (window.magicDesign.pushGA) {
+            window.magicDesign.pushGA({}, 'select_item', item);
+          }
+
+          (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
         showProgress: false

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

@@ -210,10 +210,9 @@ function (_super) {
 
     _this.getStoreInfo = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var storeId, _a, res, isFollow;
-
-        return __generator(this, function (_b) {
-          switch (_b.label) {
+        var storeId, storeDetailInfo;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
             case 0:
               storeId = window.magicDesign.storeId;
               if (!storeId) return [3
@@ -221,17 +220,15 @@ function (_super) {
               , 2];
               return [4
               /*yield*/
-              , Promise.all([(0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET'), (0, _commonUtil.commonFetch)('/designer/v1/h5/collection/store/check', {
-                storeId: storeId
-              })])];
+              , (0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET')];
 
             case 1:
-              _a = _b.sent(), res = _a[0], isFollow = _a[1];
+              storeDetailInfo = _a.sent();
               this.setState({
-                storeInfo: res,
-                isFollow: isFollow == 'Y'
+                storeInfo: storeDetailInfo,
+                isFollow: storeDetailInfo.userHasFollowed == 'Y'
               });
-              _b.label = 2;
+              _a.label = 2;
 
             case 2:
               return [2
@@ -320,8 +317,8 @@ function (_super) {
         action: 'operation',
         params: {
           type: 'CHAT',
-          storeId: storeInfo.storeId,
-          sysAccount: storeInfo.sysAccount
+          storeId: storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.storeId,
+          sysAccount: storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.sysAccount
         }
       };
       window.magicDesign.handleAction(params);

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

@@ -212,10 +212,9 @@ function (_super) {
 
     _this.getStoreInfo = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var storeId, _a, res, isFollow;
-
-        return __generator(this, function (_b) {
-          switch (_b.label) {
+        var storeId, storeDetailInfo;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
             case 0:
               storeId = window.magicDesign.storeId;
               if (!storeId) return [3
@@ -223,17 +222,15 @@ function (_super) {
               , 2];
               return [4
               /*yield*/
-              , Promise.all([(0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET'), (0, _commonUtil.commonFetch)('/designer/v1/h5/collection/store/check', {
-                storeId: storeId
-              })])];
+              , (0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET')];
 
             case 1:
-              _a = _b.sent(), res = _a[0], isFollow = _a[1];
+              storeDetailInfo = _a.sent();
               this.setState({
-                storeInfo: res,
-                isFollow: isFollow == 'Y'
+                storeInfo: storeDetailInfo,
+                isFollow: storeDetailInfo.userHasFollowed == 'Y'
               });
-              _b.label = 2;
+              _a.label = 2;
 
             case 2:
               return [2

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

@@ -81,6 +81,18 @@ function (_super) {
 
     _this.state = {};
 
+    _this.hasSource = function (type) {
+      if (!window.systemParams || !window.systemParams.recommendSource) {
+        return true;
+      }
+
+      if (window.systemParams.recommendSource && window.systemParams.recommendSource.includes(type)) {
+        return true;
+      }
+
+      return false;
+    };
+
     _this.getContentPanel = function () {
       var panelProps = _this.props.panelProps;
 
@@ -95,9 +107,9 @@ function (_super) {
           _this.selfRender();
         },
         value: panelProps.sourceType
-      }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      }, _this.hasSource('P') && /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: "select"
-      }, (0, _locale.i18n)('SELECT_PRODUCT')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      }, (0, _locale.i18n)('SELECT_PRODUCT')), _this.hasSource('A') && /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: "recommend"
       }, (0, _locale.i18n)('AI_RECOMMENDATION')))), /*#__PURE__*/_react["default"].createElement("div", {
         className: "greyBg"

package/lib/utils/commonUtil.js

@@ -7,7 +7,7 @@ exports.addZero = exports.addUrlQuery = void 0;
 exports.asyncDataURLtoImage = asyncDataURLtoImage;
 exports.checkFileName = exports.calcLastTime = exports.asyncNextTick = void 0;
 exports.commonFetch = commonFetch;
-exports.compatibleNewPageData = void 0;
+exports.convertCount = exports.compatibleNewPageData = void 0;
 exports.convertImageUrl = convertImageUrl;
 exports.convertToRem = void 0;
 exports.copy2ClipBoard = copy2ClipBoard;
@@ -884,4 +884,18 @@ var downloadBase64Image = function downloadBase64Image(base64String, filename) {
   link.click();
 };
 
-exports.downloadBase64Image = downloadBase64Image;
+exports.downloadBase64Image = downloadBase64Image;
+
+var convertCount = function convertCount(value) {
+  var newValue = value;
+
+  if (value >= 1000000) {
+    newValue = Number(value / 1000000).toFixed(1) + "M";
+  } else if (value >= 1000) {
+    newValue = Number(value / 1000).toFixed(1) + "K";
+  }
+
+  return newValue;
+};
+
+exports.convertCount = convertCount;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",