@fonixtree/magic-design 0.1.51 → 0.1.52

package/es/common/LinkModal/ProductDetailPage/index.js

@@ -307,7 +307,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/brands/list", {}, 'GET')];
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/stores/contract/brands")];
 
           case 1:
             res = _a.sent();

package/es/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")];
+              , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/stores/contract/brands")];
 
             case 3:
               res = _a.sent();

package/es/utils/commonUtil.js

@@ -214,7 +214,8 @@ function commonFetch(url, data, method) {
     var credentials = localStorage.getItem('credentials');
     var headers = {
       'Content-Type': 'application/json; charset=UTF-8',
-      credentials: credentials
+      credentials: credentials,
+      accessToken: credentials
     };
 
     if (_method === 'GET') {
@@ -731,33 +732,7 @@ var convertToRem = function convertToRem(value) {
 exports.convertToRem = convertToRem;
 
 var pxToRem = function pxToRem(styleObj) {
-  if (window.magicDesign.device === 'pc' || window.magicDesign.mode === 'designer') {
-    return styleObj;
-  }
-
-  var remObj = {};
-
-  for (var key in styleObj) {
-    if (styleObj.hasOwnProperty(key)) {
-      var value = styleObj[key];
-
-      if (typeof value === 'string' && value.endsWith('px')) {
-        remObj[key] = key === 'opacity' || key === 'lineHeight' ? value : convertToRem(value);
-      } else if (typeof value === 'number') {
-        remObj[key] = convertToRem(value);
-      } else if ((key === 'padding' || key === 'margin') && typeof value === 'string') {
-        var paddingValues = value.split(' ');
-        var remPaddingValues = paddingValues.map(function (paddingValue) {
-          return paddingValue.endsWith('px') ? convertToRem(paddingValue) : paddingValue;
-        });
-        remObj[key] = remPaddingValues.join(' ');
-      } else {
-        remObj[key] = value;
-      }
-    }
-  }
-
-  return remObj;
+  return styleObj;
 };
 
 exports.pxToRem = pxToRem;

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

@@ -307,7 +307,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/brands/list", {}, 'GET')];
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/stores/contract/brands")];
 
           case 1:
             res = _a.sent();

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")];
+              , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/stores/contract/brands")];
 
             case 3:
               res = _a.sent();

package/lib/utils/commonUtil.js

@@ -214,7 +214,8 @@ function commonFetch(url, data, method) {
     var credentials = localStorage.getItem('credentials');
     var headers = {
       'Content-Type': 'application/json; charset=UTF-8',
-      credentials: credentials
+      credentials: credentials,
+      accessToken: credentials
     };
 
     if (_method === 'GET') {
@@ -731,33 +732,7 @@ var convertToRem = function convertToRem(value) {
 exports.convertToRem = convertToRem;
 
 var pxToRem = function pxToRem(styleObj) {
-  if (window.magicDesign.device === 'pc' || window.magicDesign.mode === 'designer') {
-    return styleObj;
-  }
-
-  var remObj = {};
-
-  for (var key in styleObj) {
-    if (styleObj.hasOwnProperty(key)) {
-      var value = styleObj[key];
-
-      if (typeof value === 'string' && value.endsWith('px')) {
-        remObj[key] = key === 'opacity' || key === 'lineHeight' ? value : convertToRem(value);
-      } else if (typeof value === 'number') {
-        remObj[key] = convertToRem(value);
-      } else if ((key === 'padding' || key === 'margin') && typeof value === 'string') {
-        var paddingValues = value.split(' ');
-        var remPaddingValues = paddingValues.map(function (paddingValue) {
-          return paddingValue.endsWith('px') ? convertToRem(paddingValue) : paddingValue;
-        });
-        remObj[key] = remPaddingValues.join(' ');
-      } else {
-        remObj[key] = value;
-      }
-    }
-  }
-
-  return remObj;
+  return styleObj;
 };
 
 exports.pxToRem = pxToRem;

package/package.json

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