@fonixtree/magic-design 2.0.195 → 2.0.198

package/es/assets/less/common.less

@@ -85,6 +85,18 @@
   text-overflow: ellipsis;
 }
 
+.two_row {
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  line-height: 1.5em;
+  /* 设置行高 */
+  max-height: 3em;
+  /* 行高的两倍，因为最多显示两行 */
+}
+
 .common_mask {
   position: fixed;
   top: 0;

package/es/composite-comp/dito/components/SearchBar/defaultJSON.js

@@ -91,7 +91,10 @@ var getDefaultJSON = function getDefaultJSON() {
         type: 'BUTTON',
         text: 0,
         content: {
-          url: '',
+          url: {
+            name: '/my-points',
+            value: '/my-points'
+          },
           backgroundColor: ''
         },
         buttonText: {

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

@@ -15,6 +15,8 @@ var _common = require("../../../../../common");
 
 var _ImageConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/ImageConfig"));
 
+var _ButtonConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/ButtonConfig"));
+
 var _coreUtil = require("../../../../../utils/coreUtil");
 
 var _locale = require("../../../../../locale");
@@ -213,7 +215,9 @@ function (_super) {
       key: 'search6',
       name: (0, _locale.i18n)('POINTS'),
       toggleType: 'switch',
-      value: null,
+      value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
+        data: panelProps.points
+      }),
       metaOption: panelProps.points
     }];
     return /*#__PURE__*/_react["default"].createElement(_common.Collapse, {

package/es/composite-comp/public/components/Location/mobile/index.js

@@ -102,7 +102,7 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "address-wrap",
       onClick: function onClick() {
-        return (0, _coreUtil.clickUrl)('/location');
+        return (0, _coreUtil.clickUrl)(locationInfo.address ? '/location' : '/add-location');
       }
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "address-bg",
@@ -116,7 +116,7 @@ function (_super) {
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "text"
     }, panelProps.content.address.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
-      className: "address one_row",
+      className: "address two_row",
       data: __assign(__assign({}, panelProps.content.address), {
         text: (0, _coreUtil.isDesignMode)() ? (0, _locale.i18n)('DISPLAY_LOCATION_ADDRESS') : locationInfo.address
       })

package/es/utils/businessUtil.js

@@ -298,7 +298,9 @@ var newParseUrl = function newParseUrl(urlObj) {
         '/product/GroupBuy': 'GROUP',
         '/search-page': 'SEARCH_PAGE',
         '/commission': 'COMMISSION',
-        '/location': 'ADD_ADDRESS_PAGE'
+        '/add-location': 'ADD_ADDRESS_PAGE',
+        '/location': 'ADDRESS_PAGE',
+        '/my-points': 'POINT_PAGE'
       };
       var typeTemp = map[link];
 
@@ -366,8 +368,8 @@ var parseUrl = function parseUrl(url) {
         action: 'jump',
         params: {
           type: 'PRODUCT_DETAIL',
-          offerId: arg1,
-          productId: arg2
+          offerId: Number(arg1),
+          productId: Number(arg2)
         }
       };
       break;
@@ -390,7 +392,7 @@ var parseUrl = function parseUrl(url) {
         action: 'jump',
         params: {
           type: 'STORE',
-          storeId: arg1
+          storeId: Number(arg1)
         }
       };
       break;
@@ -476,7 +478,9 @@ var parseUrl = function parseUrl(url) {
         '/search-page': 'SEARCH_PAGE',
         '/main/my-commission': 'WALLET',
         '/commission': 'COMMISSION',
-        '/location': 'ADD_ADDRESS_PAGE'
+        '/add-location': 'ADD_ADDRESS_PAGE',
+        '/location': 'ADDRESS_PAGE',
+        '/my-points': 'POINT_PAGE'
       };
       link = url;
       params = {

package/es/utils/coreUtil.js

@@ -405,8 +405,8 @@ var clickUrl = function clickUrl(url, state) {
         (0, _commonUtil.navigateTo)(link, state);
       }
     } else if (((_b = window === null || window === void 0 ? void 0 : window.magicDesign) === null || _b === void 0 ? void 0 : _b.projectCode) === 'pto') {
-      // 输入的是完整的跳转地址
-      if (isUrl(link)) {
+      // 输入的是完整的跳转地址 排除掉‘https://www.baidu.com;mydito://BuyLoad’这种情况
+      if (isUrl(link) && !link.includes('mydito://')) {
         if (!link.includes(window.location.host)) {
           // 跳转外链 需要把token带上
           if (link.includes('?')) {

package/lib/assets/less/common.less

@@ -85,6 +85,18 @@
   text-overflow: ellipsis;
 }
 
+.two_row {
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  line-height: 1.5em;
+  /* 设置行高 */
+  max-height: 3em;
+  /* 行高的两倍，因为最多显示两行 */
+}
+
 .common_mask {
   position: fixed;
   top: 0;

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

@@ -91,7 +91,10 @@ var getDefaultJSON = function getDefaultJSON() {
         type: 'BUTTON',
         text: 0,
         content: {
-          url: '',
+          url: {
+            name: '/my-points',
+            value: '/my-points'
+          },
           backgroundColor: ''
         },
         buttonText: {

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

@@ -15,6 +15,8 @@ var _common = require("../../../../../common");
 
 var _ImageConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/ImageConfig"));
 
+var _ButtonConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/ButtonConfig"));
+
 var _coreUtil = require("../../../../../utils/coreUtil");
 
 var _locale = require("../../../../../locale");
@@ -213,7 +215,9 @@ function (_super) {
       key: 'search6',
       name: (0, _locale.i18n)('POINTS'),
       toggleType: 'switch',
-      value: null,
+      value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
+        data: panelProps.points
+      }),
       metaOption: panelProps.points
     }];
     return /*#__PURE__*/_react["default"].createElement(_common.Collapse, {

package/lib/composite-comp/public/components/Location/mobile/index.js

@@ -102,7 +102,7 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "address-wrap",
       onClick: function onClick() {
-        return (0, _coreUtil.clickUrl)('/location');
+        return (0, _coreUtil.clickUrl)(locationInfo.address ? '/location' : '/add-location');
       }
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "address-bg",
@@ -116,7 +116,7 @@ function (_super) {
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "text"
     }, panelProps.content.address.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
-      className: "address one_row",
+      className: "address two_row",
       data: __assign(__assign({}, panelProps.content.address), {
         text: (0, _coreUtil.isDesignMode)() ? (0, _locale.i18n)('DISPLAY_LOCATION_ADDRESS') : locationInfo.address
       })

package/lib/utils/businessUtil.js

@@ -298,7 +298,9 @@ var newParseUrl = function newParseUrl(urlObj) {
         '/product/GroupBuy': 'GROUP',
         '/search-page': 'SEARCH_PAGE',
         '/commission': 'COMMISSION',
-        '/location': 'ADD_ADDRESS_PAGE'
+        '/add-location': 'ADD_ADDRESS_PAGE',
+        '/location': 'ADDRESS_PAGE',
+        '/my-points': 'POINT_PAGE'
       };
       var typeTemp = map[link];
 
@@ -366,8 +368,8 @@ var parseUrl = function parseUrl(url) {
         action: 'jump',
         params: {
           type: 'PRODUCT_DETAIL',
-          offerId: arg1,
-          productId: arg2
+          offerId: Number(arg1),
+          productId: Number(arg2)
         }
       };
       break;
@@ -390,7 +392,7 @@ var parseUrl = function parseUrl(url) {
         action: 'jump',
         params: {
           type: 'STORE',
-          storeId: arg1
+          storeId: Number(arg1)
         }
       };
       break;
@@ -476,7 +478,9 @@ var parseUrl = function parseUrl(url) {
         '/search-page': 'SEARCH_PAGE',
         '/main/my-commission': 'WALLET',
         '/commission': 'COMMISSION',
-        '/location': 'ADD_ADDRESS_PAGE'
+        '/add-location': 'ADD_ADDRESS_PAGE',
+        '/location': 'ADDRESS_PAGE',
+        '/my-points': 'POINT_PAGE'
       };
       link = url;
       params = {

package/lib/utils/coreUtil.js

@@ -405,8 +405,8 @@ var clickUrl = function clickUrl(url, state) {
         (0, _commonUtil.navigateTo)(link, state);
       }
     } else if (((_b = window === null || window === void 0 ? void 0 : window.magicDesign) === null || _b === void 0 ? void 0 : _b.projectCode) === 'pto') {
-      // 输入的是完整的跳转地址
-      if (isUrl(link)) {
+      // 输入的是完整的跳转地址 排除掉‘https://www.baidu.com;mydito://BuyLoad’这种情况
+      if (isUrl(link) && !link.includes('mydito://')) {
         if (!link.includes(window.location.host)) {
           // 跳转外链 需要把token带上
           if (link.includes('?')) {

package/package.json

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