@fonixtree/magic-design 1.0.178 → 1.0.179

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

@@ -15,6 +15,8 @@ var _antd = require("antd");
 
 var _avatar = _interopRequireDefault(require("./images/avatar.png"));
 
+var _edit = _interopRequireDefault(require("./images/edit.png"));
+
 var _components = require("../../../../../meta-comp/components");
 
 var _androidUtil = require("../../../../../utils/androidUtil");
@@ -593,8 +595,6 @@ function (_super) {
       className: "photo",
       src: userInfo.photo || _avatar["default"],
       style: {
-        height: 44,
-        width: 44,
         background: userInfo.photo ? '#fff' : 'unset'
       }
     }), /*#__PURE__*/_react["default"].createElement("input", {
@@ -602,6 +602,10 @@ function (_super) {
       id: "userPhoto",
       onChange: this.handleFileChange,
       type: "file"
+    }), /*#__PURE__*/_react["default"].createElement("img", {
+      alt: "",
+      className: "edit-icon",
+      src: _edit["default"]
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "userInfo"
     }, /*#__PURE__*/_react["default"].createElement("span", {

package/es/composite-comp/dito/components/PersonalInformationSecond/mobile/index.less

@@ -16,8 +16,8 @@
   display: inline-block;
   vertical-align: middle;
   margin-right: 0.32rem;
-  height: 0.88rem;
-  width: 0.88rem;
+  height: 0.76rem;
+  width: 0.76rem;
 }
 .personal-information-second-mobile .top .pInfoWrap .photoWrap > input {
   position: absolute;
@@ -31,10 +31,10 @@
 .personal-information-second-mobile .top .pInfoWrap .photoWrap .decorationIcon {
   position: absolute;
   z-index: 1;
-  width: 1.4rem;
-  height: 1.4rem;
-  left: -0.26rem;
-  top: -0.26rem;
+  width: 1.2rem;
+  height: 1.2rem;
+  left: -0.22rem;
+  top: -0.22rem;
 }
 .personal-information-second-mobile .top .pInfoWrap .userInfo {
   display: inline-block;
@@ -75,12 +75,20 @@
 }
 .personal-information-second-mobile .top .pInfoWrap .photo {
   display: inline-block;
-  width: 0.88rem;
-  height: 0.88rem;
+  width: 0.76rem;
+  height: 0.76rem;
   line-height: 1.2rem;
   text-align: center;
   border-radius: 50%;
 }
+.personal-information-second-mobile .top .pInfoWrap .edit-icon {
+  position: absolute;
+  z-index: 2;
+  bottom: 0;
+  right: 0;
+  width: 0.3rem;
+  height: 0.3rem;
+}
 .personal-information-second-mobile .top .pInfoWrap .btnLogin {
   font-size: 0.32rem;
   font-weight: 600;

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

@@ -167,9 +167,10 @@ function (_super) {
         backgroundColor: (_e = (_d = data.content.box) === null || _d === void 0 ? void 0 : _d.backgroundColor) === null || _e === void 0 ? void 0 : _e.mobile
       }
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+      bold: true,
       color: (_g = (_f = data.content.box) === null || _f === void 0 ? void 0 : _f.iconColor) === null || _g === void 0 ? void 0 : _g.mobile,
       size: (0, _commonUtil.convertToRem)(20),
-      type: "icon-search2"
+      type: "icon-search-short"
     })), data.content && ((_h = data.content.cartIcon) === null || _h === void 0 ? void 0 : _h.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       className: "right-icon",
       data: data.content.cartIcon,

package/es/composite-comp/dito/components/SearchBanner/mobile/index.less

@@ -25,8 +25,8 @@
   background: transparent;
   border-radius: 0.4rem;
   border: 0.02rem solid #fff;
-  padding: 0.08rem 0.2rem;
-  height: 0.56rem;
+  padding: 0.08rem 0.2rem 0.08rem 0.08rem;
+  height: 0.54rem;
   text-align: right;
   display: flex;
   justify-content: flex-start;

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

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _commonUtil = require("../../../../../../../utils/commonUtil");
+
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -45,14 +47,15 @@ function (_super) {
   __extends(VideoItem, _super);
 
   function VideoItem() {
-    var _this = _super !== null && _super.apply(this, arguments) || this;
+    var _a;
+
+    var _this = _super.apply(this, arguments) || this;
 
     _this.state = {
-      playing: false,
+      playing: !!(((_a = _this.props.data.video) === null || _a === void 0 ? void 0 : _a.sourceUrl) && (0, _commonUtil.isPad)()),
       videoPoster: ''
     };
     _this.videoRef = /*#__PURE__*/_react["default"].createRef();
-    _this.cardRef = /*#__PURE__*/_react["default"].createRef();
     _this.canvasRef = /*#__PURE__*/_react["default"].createRef();
 
     _this.onMouseEnter = function () {
@@ -85,11 +88,11 @@ function (_super) {
   VideoItem.prototype.componentDidMount = function () {
     var _this = this;
 
-    var dom = this.cardRef.current;
-    dom.addEventListener('mousemove', this.handleMouseMove);
-    dom.addEventListener('mouseleave', this.handleMouseLeave);
+    if (this.videoRef.current && (0, _commonUtil.isPad)()) {
+      this.videoRef.current.autoplay = true;
+    }
 
-    if (this.videoRef.current) {
+    if (this.videoRef.current && !(0, _commonUtil.isPad)()) {
       var video_1 = this.videoRef.current;
       var canvas_1 = this.canvasRef.current;
       video_1.addEventListener('loadedmetadata', function () {
@@ -111,13 +114,9 @@ function (_super) {
     }
   };
 
-  VideoItem.prototype.componentWillUnmount = function () {
-    var dom = this.cardRef.current;
-    dom.removeEventListener('mousemove', this.handleMouseMove);
-    dom.removeEventListener('mouseleave', this.handleMouseLeave);
-  };
-
   VideoItem.prototype.render = function () {
+    var _this = this;
+
     var _a, _b, _c, _d, _e, _f, _g, _h;
 
     var _j = this.props,
@@ -130,10 +129,17 @@ function (_super) {
         videoPoster = _k.videoPoster;
     var img = ((_b = (_a = data.overilay) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.pcImgSrc) || videoPoster;
     return /*#__PURE__*/_react["default"].createElement("div", {
-      ref: this.cardRef,
       className: "slide-image-video-wrap",
-      onMouseEnter: this.onMouseEnter,
-      onMouseLeave: this.onMouseLeave,
+      onMouseEnter: function onMouseEnter() {
+        if (!(0, _commonUtil.isPad)()) {
+          _this.onMouseEnter();
+        }
+      },
+      onMouseLeave: function onMouseLeave() {
+        if (!(0, _commonUtil.isPad)()) {
+          _this.onMouseLeave();
+        }
+      },
       style: {
         cursor: cursor && (moveIcon === null || moveIcon === void 0 ? void 0 : moveIcon.open) ? "url('" + ((_c = moveIcon === null || moveIcon === void 0 ? void 0 : moveIcon.content) === null || _c === void 0 ? void 0 : _c.pcImgSrc) + "'), pointer" : 'unset'
       }

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

@@ -1,9 +1,6 @@
 .slide-image-video-wrap {
   position: relative;
-  display: flex;
   border-radius: 16px;
-  --dx: calc(var(--size) - var(--x));
-  --dy: calc(var(--size) - var(--y));
 
   &:hover {
     box-shadow: 0px 12px 48px 0px #00000029;

package/es/utils/commonUtil.js

@@ -21,7 +21,7 @@ exports.getUrlParams = void 0;
 exports.goLogin = goLogin;
 exports.importAsync = void 0;
 exports.isLogin = isLogin;
-exports.onListenTouch = exports.nextTick = exports.navigateTo = void 0;
+exports.onListenTouch = exports.nextTick = exports.navigateTo = exports.isPad = void 0;
 exports.pushGA = pushGA;
 exports.setDefaultAddressFromIP = exports.pxToRem = void 0;
 exports.shareFacebook = shareFacebook;
@@ -516,6 +516,21 @@ var JsonToUrl = function JsonToUrl(data) {
 
   var urlParamsStr = tempArr.join('&');
   return urlParamsStr;
+};
+
+exports.JsonToUrl = JsonToUrl;
+
+var isPad = function isPad() {
+  var ua = navigator.userAgent;
+  var isMac = /Macintosh/i.test(ua);
+  var isIOS = /iPad|iPhone|iPod/i.test(ua);
+  var isTouch = 'ontouchstart' in window || navigator.maxTouchPoints > 0; // iPad检测 (包括iPadOS 13+)
+
+  if (isMac && isTouch || isIOS) {
+    return true;
+  }
+
+  return false;
 }; // export const jumpUrlConfig = item => {
 //   const { objType, objValue } = item || {};
 //   let jumpUrl = '';
@@ -581,7 +596,7 @@ var JsonToUrl = function JsonToUrl(data) {
  */
 
 
-exports.JsonToUrl = JsonToUrl;
+exports.isPad = isPad;
 
 var addZero = function addZero(num) {
   return String(num).length === 1 ? "0" + String(num) : String(num);

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

@@ -15,6 +15,8 @@ var _antd = require("antd");
 
 var _avatar = _interopRequireDefault(require("./images/avatar.png"));
 
+var _edit = _interopRequireDefault(require("./images/edit.png"));
+
 var _components = require("../../../../../meta-comp/components");
 
 var _androidUtil = require("../../../../../utils/androidUtil");
@@ -593,8 +595,6 @@ function (_super) {
       className: "photo",
       src: userInfo.photo || _avatar["default"],
       style: {
-        height: 44,
-        width: 44,
         background: userInfo.photo ? '#fff' : 'unset'
       }
     }), /*#__PURE__*/_react["default"].createElement("input", {
@@ -602,6 +602,10 @@ function (_super) {
       id: "userPhoto",
       onChange: this.handleFileChange,
       type: "file"
+    }), /*#__PURE__*/_react["default"].createElement("img", {
+      alt: "",
+      className: "edit-icon",
+      src: _edit["default"]
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "userInfo"
     }, /*#__PURE__*/_react["default"].createElement("span", {

package/lib/composite-comp/dito/components/PersonalInformationSecond/mobile/index.less

@@ -16,8 +16,8 @@
   display: inline-block;
   vertical-align: middle;
   margin-right: 0.32rem;
-  height: 0.88rem;
-  width: 0.88rem;
+  height: 0.76rem;
+  width: 0.76rem;
 }
 .personal-information-second-mobile .top .pInfoWrap .photoWrap > input {
   position: absolute;
@@ -31,10 +31,10 @@
 .personal-information-second-mobile .top .pInfoWrap .photoWrap .decorationIcon {
   position: absolute;
   z-index: 1;
-  width: 1.4rem;
-  height: 1.4rem;
-  left: -0.26rem;
-  top: -0.26rem;
+  width: 1.2rem;
+  height: 1.2rem;
+  left: -0.22rem;
+  top: -0.22rem;
 }
 .personal-information-second-mobile .top .pInfoWrap .userInfo {
   display: inline-block;
@@ -75,12 +75,20 @@
 }
 .personal-information-second-mobile .top .pInfoWrap .photo {
   display: inline-block;
-  width: 0.88rem;
-  height: 0.88rem;
+  width: 0.76rem;
+  height: 0.76rem;
   line-height: 1.2rem;
   text-align: center;
   border-radius: 50%;
 }
+.personal-information-second-mobile .top .pInfoWrap .edit-icon {
+  position: absolute;
+  z-index: 2;
+  bottom: 0;
+  right: 0;
+  width: 0.3rem;
+  height: 0.3rem;
+}
 .personal-information-second-mobile .top .pInfoWrap .btnLogin {
   font-size: 0.32rem;
   font-weight: 600;

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

@@ -167,9 +167,10 @@ function (_super) {
         backgroundColor: (_e = (_d = data.content.box) === null || _d === void 0 ? void 0 : _d.backgroundColor) === null || _e === void 0 ? void 0 : _e.mobile
       }
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+      bold: true,
       color: (_g = (_f = data.content.box) === null || _f === void 0 ? void 0 : _f.iconColor) === null || _g === void 0 ? void 0 : _g.mobile,
       size: (0, _commonUtil.convertToRem)(20),
-      type: "icon-search2"
+      type: "icon-search-short"
     })), data.content && ((_h = data.content.cartIcon) === null || _h === void 0 ? void 0 : _h.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       className: "right-icon",
       data: data.content.cartIcon,

package/lib/composite-comp/dito/components/SearchBanner/mobile/index.less

@@ -25,8 +25,8 @@
   background: transparent;
   border-radius: 0.4rem;
   border: 0.02rem solid #fff;
-  padding: 0.08rem 0.2rem;
-  height: 0.56rem;
+  padding: 0.08rem 0.2rem 0.08rem 0.08rem;
+  height: 0.54rem;
   text-align: right;
   display: flex;
   justify-content: flex-start;

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

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _commonUtil = require("../../../../../../../utils/commonUtil");
+
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -45,14 +47,15 @@ function (_super) {
   __extends(VideoItem, _super);
 
   function VideoItem() {
-    var _this = _super !== null && _super.apply(this, arguments) || this;
+    var _a;
+
+    var _this = _super.apply(this, arguments) || this;
 
     _this.state = {
-      playing: false,
+      playing: !!(((_a = _this.props.data.video) === null || _a === void 0 ? void 0 : _a.sourceUrl) && (0, _commonUtil.isPad)()),
       videoPoster: ''
     };
     _this.videoRef = /*#__PURE__*/_react["default"].createRef();
-    _this.cardRef = /*#__PURE__*/_react["default"].createRef();
     _this.canvasRef = /*#__PURE__*/_react["default"].createRef();
 
     _this.onMouseEnter = function () {
@@ -85,11 +88,11 @@ function (_super) {
   VideoItem.prototype.componentDidMount = function () {
     var _this = this;
 
-    var dom = this.cardRef.current;
-    dom.addEventListener('mousemove', this.handleMouseMove);
-    dom.addEventListener('mouseleave', this.handleMouseLeave);
+    if (this.videoRef.current && (0, _commonUtil.isPad)()) {
+      this.videoRef.current.autoplay = true;
+    }
 
-    if (this.videoRef.current) {
+    if (this.videoRef.current && !(0, _commonUtil.isPad)()) {
       var video_1 = this.videoRef.current;
       var canvas_1 = this.canvasRef.current;
       video_1.addEventListener('loadedmetadata', function () {
@@ -111,13 +114,9 @@ function (_super) {
     }
   };
 
-  VideoItem.prototype.componentWillUnmount = function () {
-    var dom = this.cardRef.current;
-    dom.removeEventListener('mousemove', this.handleMouseMove);
-    dom.removeEventListener('mouseleave', this.handleMouseLeave);
-  };
-
   VideoItem.prototype.render = function () {
+    var _this = this;
+
     var _a, _b, _c, _d, _e, _f, _g, _h;
 
     var _j = this.props,
@@ -130,10 +129,17 @@ function (_super) {
         videoPoster = _k.videoPoster;
     var img = ((_b = (_a = data.overilay) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.pcImgSrc) || videoPoster;
     return /*#__PURE__*/_react["default"].createElement("div", {
-      ref: this.cardRef,
       className: "slide-image-video-wrap",
-      onMouseEnter: this.onMouseEnter,
-      onMouseLeave: this.onMouseLeave,
+      onMouseEnter: function onMouseEnter() {
+        if (!(0, _commonUtil.isPad)()) {
+          _this.onMouseEnter();
+        }
+      },
+      onMouseLeave: function onMouseLeave() {
+        if (!(0, _commonUtil.isPad)()) {
+          _this.onMouseLeave();
+        }
+      },
       style: {
         cursor: cursor && (moveIcon === null || moveIcon === void 0 ? void 0 : moveIcon.open) ? "url('" + ((_c = moveIcon === null || moveIcon === void 0 ? void 0 : moveIcon.content) === null || _c === void 0 ? void 0 : _c.pcImgSrc) + "'), pointer" : 'unset'
       }

package/lib/composite-comp/dito/components/SlideImage/pc/components/VideoItem/index.less

@@ -1,9 +1,6 @@
 .slide-image-video-wrap {
   position: relative;
-  display: flex;
   border-radius: 16px;
-  --dx: calc(var(--size) - var(--x));
-  --dy: calc(var(--size) - var(--y));
 
   &:hover {
     box-shadow: 0px 12px 48px 0px #00000029;

package/lib/utils/commonUtil.js

@@ -21,7 +21,7 @@ exports.getUrlParams = void 0;
 exports.goLogin = goLogin;
 exports.importAsync = void 0;
 exports.isLogin = isLogin;
-exports.onListenTouch = exports.nextTick = exports.navigateTo = void 0;
+exports.onListenTouch = exports.nextTick = exports.navigateTo = exports.isPad = void 0;
 exports.pushGA = pushGA;
 exports.setDefaultAddressFromIP = exports.pxToRem = void 0;
 exports.shareFacebook = shareFacebook;
@@ -516,6 +516,21 @@ var JsonToUrl = function JsonToUrl(data) {
 
   var urlParamsStr = tempArr.join('&');
   return urlParamsStr;
+};
+
+exports.JsonToUrl = JsonToUrl;
+
+var isPad = function isPad() {
+  var ua = navigator.userAgent;
+  var isMac = /Macintosh/i.test(ua);
+  var isIOS = /iPad|iPhone|iPod/i.test(ua);
+  var isTouch = 'ontouchstart' in window || navigator.maxTouchPoints > 0; // iPad检测 (包括iPadOS 13+)
+
+  if (isMac && isTouch || isIOS) {
+    return true;
+  }
+
+  return false;
 }; // export const jumpUrlConfig = item => {
 //   const { objType, objValue } = item || {};
 //   let jumpUrl = '';
@@ -581,7 +596,7 @@ var JsonToUrl = function JsonToUrl(data) {
  */
 
 
-exports.JsonToUrl = JsonToUrl;
+exports.isPad = isPad;
 
 var addZero = function addZero(num) {
   return String(num).length === 1 ? "0" + String(num) : String(num);

package/package.json

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