@fonixtree/magic-design 0.1.92 → 0.2.1

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

@@ -34,7 +34,7 @@
 
     .cashBackBox_cashBack {
       display: flex;
-      align-items: flex-start;
+      align-items: center;
 
       img {
         width: 14px;
@@ -43,7 +43,6 @@
 
       .cashBackBox_text {
         display: flex;
-        flex-wrap: wrap;
         align-items: center;
         padding-left: 4px;
         color: #279e2c;
@@ -62,28 +61,6 @@
         font-size: 9px;
         padding-left: 2px;
       }
-
-      .gratis_text {
-        display: flex;
-        align-items: center;
-        padding-left: 4px;
-        color: #279E2C;
-        font-family: Trueno;
-        font-size: 18px;
-        font-style: normal;
-        font-weight: 800;
-        line-height: 12px;
-        padding: 7px 0;
-
-        span {
-          color: #696973;
-          font-size: 9px;
-          text-decoration: line-through;
-          font-weight: 400;
-          margin-left: 8px;
-        }
-
-      }
     }
 
     .cashBackBox_koin {
@@ -118,13 +95,6 @@
     }
   }
 
-  .tip {
-    color: #F94600;
-    font-size: 9px;
-    font-weight: 400;
-    padding: 6px 4px;
-  }
-
   .producItemPrice {
     padding: 4px;
   }

package/lib/composite-comp/common/config-panels/SpacingConfig/index.js

@@ -92,7 +92,6 @@ function (_super) {
         _this.selfRender();
       }
     })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
-      split: "dashed",
       title: (0, _locale.i18n)('PADDING')
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "padding-wrap"

package/{es/composite-comp/nuri → lib/composite-comp/dito}/components/AffiliateRecommend/mobile/index.js

@@ -314,10 +314,8 @@ function (_super) {
 
         var _this = this;
 
-        var _e;
-
-        return __generator(this, function (_f) {
-          switch (_f.label) {
+        return __generator(this, function (_e) {
+          switch (_e.label) {
             case 0:
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
@@ -343,10 +341,10 @@ function (_super) {
 
               _a = (groupSource[index] || {}).prodIds, prodIds = _a === void 0 ? '' : _a;
               newData = [];
-              _f.label = 1;
+              _e.label = 1;
 
             case 1:
-              _f.trys.push([1, 5,, 6]);
+              _e.trys.push([1, 5,, 6]);
 
               if (!(groupSource.length > 0)) return [3
               /*break*/
@@ -360,22 +358,22 @@ function (_super) {
 
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/nuri/distribute/product/es/page', {
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/nuri/distribute/product', {
                 affiliateProductIds: prodIds,
                 pageIndex: 1,
                 pageSize: prodIds.split(',').length || 20
-              }, 'POST')];
+              }, 'GET')];
 
             case 2:
-              res = _f.sent();
-              newData = __spreadArrays((_e = res.pageInfo) === null || _e === void 0 ? void 0 : _e.list);
+              res = _e.sent();
+              newData = __spreadArrays(res.list);
               return [3
               /*break*/
               , 4];
 
             case 3:
               newData = [];
-              _f.label = 4;
+              _e.label = 4;
 
             case 4:
               return [3
@@ -383,7 +381,7 @@ function (_super) {
               , 6];
 
             case 5:
-              e_1 = _f.sent();
+              e_1 = _e.sent();
               newData = [];
               return [3
               /*break*/

package/lib/composite-comp/{nuri → dito}/components/AffiliateRecommend/pc/index.js

@@ -309,10 +309,8 @@ function (_super) {
 
         var _this = this;
 
-        var _e;
-
-        return __generator(this, function (_f) {
-          switch (_f.label) {
+        return __generator(this, function (_e) {
+          switch (_e.label) {
             case 0:
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
@@ -338,10 +336,10 @@ function (_super) {
 
               _a = (groupSource[index] || {}).prodIds, prodIds = _a === void 0 ? '' : _a;
               newData = [];
-              _f.label = 1;
+              _e.label = 1;
 
             case 1:
-              _f.trys.push([1, 5,, 6]);
+              _e.trys.push([1, 5,, 6]);
 
               if (!(groupSource.length > 0)) return [3
               /*break*/
@@ -355,22 +353,22 @@ function (_super) {
 
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/nuri/distribute/product/es/page', {
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/nuri/distribute/product', {
                 affiliateProductIds: prodIds,
                 pageIndex: 1,
                 pageSize: prodIds.split(',').length || 20
-              }, 'POST')];
+              }, 'GET')];
 
             case 2:
-              res = _f.sent();
-              newData = __spreadArrays((_e = res.pageInfo) === null || _e === void 0 ? void 0 : _e.list);
+              res = _e.sent();
+              newData = __spreadArrays(res.list);
               return [3
               /*break*/
               , 4];
 
             case 3:
               newData = [];
-              _f.label = 4;
+              _e.label = 4;
 
             case 4:
               return [3
@@ -378,7 +376,7 @@ function (_super) {
               , 6];
 
             case 5:
-              e_1 = _f.sent();
+              e_1 = _e.sent();
               newData = [];
               return [3
               /*break*/

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

@@ -423,14 +423,7 @@ function (_super) {
         }) // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId ?? ''}`)}
         ,
         onItemClick: function onItemClick() {
-          if (window.magicDesign.pushGA) {
-            window.magicDesign.pushGA({}, 'select_promotion', {
-              event_section: list.type,
-              promotion_name: item === null || item === void 0 ? void 0 : item.offerName
-            });
-          }
-
-          (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || ''));
+          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || ''));
         },
         panelProps: panelProps.content,
         unknownPrice: isWill

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

@@ -68,28 +68,23 @@ var getDefaultJSON = function getDefaultJSON() {
     groupSource: defaultHeadName.map(function (group) {
       return groupSourceHeadJSON(group);
     }),
-    // displayPage: [
-    //   {
-    //     name: 'Store Home',
-    //     type: '/store-home',
-    //     state: true,
-    //   },
-    //   {
-    //     name: 'Product Detail',
-    //     type: '/product/list',
-    //     state: true,
-    //   },
-    //   {
-    //     name: 'Poster Page',
-    //     type: '/poster',
-    //     state: true,
-    //   },
-    //   {
-    //     name: 'Community',
-    //     type: '/main/community',
-    //     state: true,
-    //   },
-    // ],
+    displayPage: [{
+      name: 'Store Home',
+      type: '/store-home',
+      state: true
+    }, {
+      name: 'Product Detail',
+      type: '/product/list',
+      state: true
+    }, {
+      name: 'Poster Page',
+      type: '/poster',
+      state: true
+    }, {
+      name: 'Community',
+      type: '/main/community',
+      state: true
+    }],
     background: {
       opacity: 100,
       color: '#fff',

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

@@ -62,8 +62,8 @@ function (_super) {
     var _this = this;
 
     var data = this.props.data;
-    var showNav = this.state.showNav; // console.log('---head data', data);
-
+    var showNav = this.state.showNav;
+    console.log('---head data', data);
     var GAData = (0, _commonUtil.getGAData)(data);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-head-navigation"

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

@@ -11,8 +11,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 require("./index.less");
 
-var _locale = require("../../../../../locale");
-
 var _components = require("../../../../../meta-comp/components");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -102,15 +100,6 @@ function (_super) {
         key: source.id,
         className: "one-card" // className={data.groupSource.length > data.customize.rowNum ? 'one-card card-margin-bottom' : 'one-card'}
         ,
-        onClick: function onClick() {
-          /** PTO 定制GA */
-          if (window.magicDesign.pushGA) {
-            window.magicDesign.pushGA({}, 'select_promotion', {
-              event_section: data.type,
-              promotion_name: source.image.content.h5ImgSrc ? source.image.content.h5Name : (0, _locale.i18n)('NAVIGATION_NAME')
-            });
-          }
-        },
         style: _this.getCardStyle(source, i)
       }, source.image.open && /*#__PURE__*/_react["default"].createElement("div", {
         className: "card-image-wrap"

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

@@ -308,14 +308,14 @@ function (_super) {
 
     _this.getProductList = function (index) {
       return __awaiter(_this, void 0, void 0, function () {
-        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 panelProps, groupSource, recommendId, pageId, cache, _a, _b, sourceType, _c, prodIds, _d, intelligentType, _e, intelligentValue, _f, maxProdNum, newData, res, res, e_1, _cache;
 
-        var _h, _j, _k;
+        var _g, _h, _j;
 
         var _this = this;
 
-        return __generator(this, function (_l) {
-          switch (_l.label) {
+        return __generator(this, function (_k) {
+          switch (_k.label) {
             case 0:
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
@@ -327,7 +327,7 @@ function (_super) {
 
                 if (cache) {
                   if ("products" + index in cache) {
-                    this.setState((_h = {}, _h["products" + index] = cache["products" + index], _h), function () {
+                    this.setState((_g = {}, _g["products" + index] = cache["products" + index], _g), function () {
                       _this.resetLayout();
                     });
                     /** 如果数据未过期 */
@@ -339,12 +339,12 @@ function (_super) {
                 }
               }
 
-              _a = groupSource[index] || {}, _b = _a.sourceType, sourceType = _b === void 0 ? '' : _b, _c = _a.prodIds, prodIds = _c === void 0 ? '' : _c, _d = _a.prodType, prodType = _d === void 0 ? '' : _d, _e = _a.intelligentType, intelligentType = _e === void 0 ? '' : _e, _f = _a.intelligentValue, intelligentValue = _f === void 0 ? [] : _f, _g = _a.maxProdNum, maxProdNum = _g === void 0 ? 10 : _g;
+              _a = groupSource[index] || {}, _b = _a.sourceType, sourceType = _b === void 0 ? '' : _b, _c = _a.prodIds, prodIds = _c === void 0 ? '' : _c, _d = _a.intelligentType, intelligentType = _d === void 0 ? '' : _d, _e = _a.intelligentValue, intelligentValue = _e === void 0 ? [] : _e, _f = _a.maxProdNum, maxProdNum = _f === void 0 ? 10 : _f;
               newData = [];
-              _l.label = 1;
+              _k.label = 1;
 
             case 1:
-              _l.trys.push([1, 9,, 10]);
+              _k.trys.push([1, 9,, 10]);
 
               if (!(groupSource.length > 0)) return [3
               /*break*/
@@ -352,25 +352,22 @@ function (_super) {
               if (!(sourceType === 'select')) return [3
               /*break*/
               , 3];
-              if (!prodIds) return [2
-              /*return*/
-              ];
-              params = {
-                state: 'A'
-              };
 
-              if (prodType === 'spu') {
-                params.offers = prodIds;
-              } else {
-                params.products = prodIds;
+              if (!prodIds) {
+                return [2
+                /*return*/
+                ];
               }
 
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/products', params, 'GET')];
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/products', {
+                products: prodIds,
+                state: 'A'
+              }, 'GET')];
 
             case 2:
-              res = _l.sent();
+              res = _k.sent();
               newData = __spreadArrays(res.list);
               return [3
               /*break*/
@@ -389,11 +386,11 @@ function (_super) {
                 intelligentType: intelligentType,
                 intelligentValue: intelligentValue.join(','),
                 aggregation: false,
-                storeId: window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''
+                storeId: window.magicDesign.storeId || ''
               }, 'POST')];
 
             case 4:
-              res = _l.sent();
+              res = _k.sent();
               newData = __spreadArrays(res.pageInfo.list);
               return [3
               /*break*/
@@ -401,7 +398,7 @@ function (_super) {
 
             case 5:
               newData = [];
-              _l.label = 6;
+              _k.label = 6;
 
             case 6:
               return [3
@@ -410,7 +407,7 @@ function (_super) {
 
             case 7:
               newData = [];
-              _l.label = 8;
+              _k.label = 8;
 
             case 8:
               return [3
@@ -418,7 +415,7 @@ function (_super) {
               , 10];
 
             case 9:
-              e_1 = _l.sent();
+              e_1 = _k.sent();
               newData = [];
               return [3
               /*break*/
@@ -427,10 +424,10 @@ function (_super) {
             case 10:
               if (!(0, _coreUtil.isDesignMode)()) {
                 _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)));
+                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_h = {}, _h["products" + index] = newData, _h.endTime = Date.now() + 3 * 60 * 1000, _h)));
               }
 
-              this.setState((_k = {}, _k["products" + index] = newData, _k), function () {
+              this.setState((_j = {}, _j["products" + index] = newData, _j), function () {
                 _this.resetLayout();
               });
               return [2
@@ -641,10 +638,8 @@ function (_super) {
         onItemClick: function onItemClick() {
           /** PTO 定制GA */
           if (window.magicDesign.pushGA) {
-            window.magicDesign.pushGA(item, 'GA_SENSOR_select_item', {
-              event_action: 'Select Item',
-              event_section: data.type,
-              promotion_name: item === null || item === void 0 ? void 0 : item.offerName
+            window.magicDesign.pushGA(item, 'select_item', {
+              event_action: 'Select Item'
             });
           }
 

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

@@ -381,7 +381,7 @@ function (_super) {
                 intelligentType: intelligentType,
                 intelligentValue: intelligentValue.join(','),
                 aggregation: false,
-                storeId: window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''
+                storeId: window.magicDesign.storeId || ''
               }, 'POST')];
 
             case 4:

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

@@ -344,19 +344,7 @@ function (_super) {
     }), !!messageNum && /*#__PURE__*/_react["default"].createElement("span", {
       className: "num"
     }, messageNum))), data.content && ((_p = data.content.logo) === null || _p === void 0 ? void 0 : _p.open) && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "logo",
-      onClick: function onClick() {
-        var _a, _b;
-        /** PTO 定制GA */
-
-
-        if (window.magicDesign.pushGA) {
-          window.magicDesign.pushGA({}, 'select_promotion', {
-            event_section: data.type,
-            promotion_name: (_b = (_a = data.content.logo) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.h5Name
-          });
-        }
-      }
+      className: "logo"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       data: data.content.logo,
       style: {

package/{es/composite-comp/nuri → lib/composite-comp/dito}/config-panels/AffiliateRecommendConfig/RecommendConfigGroup/index.js

@@ -15,7 +15,7 @@ var _Button = _interopRequireDefault(require("../../../../../common/Button"));
 
 var _GroupList = _interopRequireDefault(require("../../../../../common/GroupList"));
 
-var _defaultJSON = require("../../../../dito/components/Recommend/defaultJSON");
+var _defaultJSON = require("../../../components/Recommend/defaultJSON");
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 

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

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _antd = require("antd");
+
 var _HeadNavConfigImageGroup = _interopRequireDefault(require("./HeadNavConfigImageGroup"));
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
@@ -17,6 +19,8 @@ var _locale = require("../../../../locale");
 
 var _coreUtil = require("../../../../utils/coreUtil");
 
+var _common = require("../../../../common");
+
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -61,30 +65,25 @@ function (_super) {
       _this.setState({});
     };
 
-    return _this;
-  } // getDisplayPage = () => {
-  //   const { data } = this.props;
-  //   return (
-  //     <Field>
-  //       {
-  //         data.displayPage.map(one => (
-  //           <div key={one.name} className="head-navigation-display-wrap">
-  //             <Checkbox
-  //               checked={one.state}
-  //               onChange={e => {
-  //                 one.state = e.target.checked;
-  //                 this.selfRender();
-  //               }}
-  //             >
-  //               {one.name}
-  //             </Checkbox>
-  //           </div>
-  //         ))
-  //       }
-  //     </Field>
-  //   );
-  // }
+    _this.getDisplayPage = function () {
+      var data = _this.props.data;
+      return /*#__PURE__*/_react["default"].createElement(_common.Field, null, data.displayPage.map(function (one) {
+        return /*#__PURE__*/_react["default"].createElement("div", {
+          key: one.name,
+          className: "head-navigation-display-wrap"
+        }, /*#__PURE__*/_react["default"].createElement(_antd.Checkbox, {
+          checked: one.state,
+          onChange: function onChange(e) {
+            one.state = e.target.checked;
+
+            _this.selfRender();
+          }
+        }, one.name));
+      }));
+    };
 
+    return _this;
+  }
 
   HeadNavConfigImageGroup.prototype.render = function () {
     var data = this.props.data;
@@ -99,8 +98,11 @@ function (_super) {
         value: /*#__PURE__*/_react["default"].createElement(_HeadNavConfigImageGroup["default"], {
           source: data.groupSource
         })
-      }, // { key: 'headNavigation3', name: i18n('DISPLAY_PAGE'), value: this.getDisplayPage() },
-      {
+      }, {
+        key: 'headNavigation3',
+        name: (0, _locale.i18n)('DISPLAY_PAGE'),
+        value: this.getDisplayPage()
+      }, {
         key: 'headNavigation2',
         name: (0, _locale.i18n)('BACKGROUND'),
         value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {

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

@@ -21,6 +21,8 @@ var _locale = require("../../../../../locale");
 
 var _decorator = require("../../../../../decorator");
 
+var _defaultImg = _interopRequireDefault(require("../../../../../common/GroupList/defaultImg.png"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 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); }
@@ -98,6 +100,21 @@ function (_super) {
 
   ImageTextConfigGroup.prototype.render = function () {
     var source = this.props.source;
+
+    var _renderCard = function renderCard(src) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        className: "card_wrap"
+      }, /*#__PURE__*/_react["default"].createElement("img", {
+        alt: "",
+        src: src.image.content.h5ImgSrc || _defaultImg["default"]
+      }), /*#__PURE__*/_react["default"].createElement("div", {
+        className: "name",
+        dangerouslySetInnerHTML: {
+          __html: src.title.html || src.title.text
+        }
+      }));
+    };
+
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "banner_group"
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -105,6 +122,9 @@ function (_super) {
     }, source.length === 0 ? /*#__PURE__*/_react["default"].createElement("span", {
       className: "notice"
     }, notice) : /*#__PURE__*/_react["default"].createElement(_GroupList["default"], {
+      renderCard: function renderCard(v) {
+        return _renderCard(v);
+      },
       onClickItem: this.onClickItem,
       reRender: this.reRender,
       source: source

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

@@ -71,7 +71,7 @@ function (_super) {
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: panelProps.image,
           needHover: false,
-          onlySpecificCode: ['CustomizedPage', 'FunctionPage']
+          onlySpecificCode: "FunctionPage"
         }),
         metaOption: panelProps.image
       }];

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

@@ -71,7 +71,7 @@ function (_super) {
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: panelProps.image,
           needClickArea: false,
-          onlySpecificCode: ['CustomizedPage', 'FunctionPage']
+          onlySpecificCode: "FunctionPage"
         }),
         metaOption: panelProps.image
       }];

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

@@ -114,13 +114,11 @@ function (_super) {
       }, (0, _locale.i18n)('AI_RECOMMENDATION')))), /*#__PURE__*/_react["default"].createElement("div", {
         className: "greyBg"
       }, panelProps.sourceType === 'select' && /*#__PURE__*/_react["default"].createElement(_common.ProductSource, {
-        onChange: function onChange(ids, type) {
-          panelProps.prodIds = ids;
-          panelProps.prodType = type;
+        onChange: function onChange(v) {
+          panelProps.prodIds = v;
 
           _this.selfRender();
         },
-        prodType: panelProps.prodType,
         value: panelProps.prodIds
       }), panelProps.sourceType === 'recommend' && /*#__PURE__*/_react["default"].createElement(_AIRecommendation["default"], {
         onChange: function onChange(val) {