@fonixtree/magic-design 1.0.124 → 1.0.126

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

@@ -20,8 +20,8 @@ var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON(tex
       text: text || 'Chat With Us',
       content: {
         sizeType: 'Customize font styles',
-        fontFamily: 'Montserrat',
-        fontWeight: 500,
+        fontFamily: 'Open Sans',
+        fontWeight: 600,
         fontSize: 14,
         color: '#2C2C2C',
         width: 0,

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

@@ -9,16 +9,12 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
-
 var _components = require("../../../../../meta-comp/components");
 
 var _common = require("../../../../../common");
 
 var _commonUtil = require("../../../../../utils/commonUtil");
 
-var _storeUtil = require("../../../../../utils/storeUtil");
-
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -75,15 +71,11 @@ function (_super) {
     var _this = this;
 
     var data = this.props.data;
-    var LPObj = (0, _storeUtil.getSessionStore)('channelPurchase') || {};
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('common-functions-mobile')
     }, /*#__PURE__*/_react["default"].createElement("ul", null, data.groupSource.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement("li", {
         key: item.id,
-        className: (0, _classnames["default"])({
-          hide: !(0, _isEmpty["default"])(LPObj) && item.title.text === 'Security Center'
-        }),
         onClick: function onClick() {
           return _this.onItemClick(item);
         }

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

@@ -14,9 +14,6 @@
   justify-content: space-between;
   align-items: center;
 }
-.common-functions-mobile ul li.hide {
-  display: none;
-}
 .common-functions-mobile ul li .content-wrap {
   display: flex;
   align-items: center;

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

@@ -20,8 +20,8 @@ var OrdersGroupSourceJSON = function OrdersGroupSourceJSON(text) {
       text: text || 'Name',
       content: {
         sizeType: 'Customize font styles',
-        fontFamily: 'Montserrat',
-        fontWeight: 500,
+        fontFamily: 'Open Sans',
+        fontWeight: 400,
         fontSize: 12,
         color: '#2C2C2C',
         width: 0,

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

@@ -20,8 +20,8 @@ var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON(text) {
       text: text || 'Name',
       content: {
         sizeType: 'Customize font styles',
-        fontFamily: 'Montserrat',
-        fontWeight: 500,
+        fontFamily: 'Open Sans',
+        fontWeight: 400,
         fontSize: 12,
         color: '#fff',
         width: 0,
@@ -43,7 +43,7 @@ var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON(text) {
       text: 0,
       content: {
         sizeType: 'Customize font styles',
-        fontFamily: 'Montserrat',
+        fontFamily: 'Open Sans',
         fontWeight: 600,
         fontSize: 18,
         color: '#fff',

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

@@ -537,11 +537,11 @@ function (_super) {
       onClick: this.goLoginPage
     }, (0, _locale.i18n)('LOGIN_OR_REGISTER')))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "btnGroup"
-    }, !(0, _isEmpty["default"])(LPObj) && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+    }, (0, _isEmpty["default"])(LPObj) && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
       color: "#fff",
       onClick: this.goSettings,
       size: 24,
-      type: "icon-settings"
+      type: "icon-set"
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "iconWrap"
     }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
@@ -551,7 +551,7 @@ function (_super) {
       type: "icon-messages"
     }), !!messageNum && /*#__PURE__*/_react["default"].createElement("span", {
       className: "num"
-    }, messageNum)))), (0, _commonUtil.isLogin)() && /*#__PURE__*/_react["default"].createElement("div", {
+    }, messageNum)))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "bottom"
     }, data.groupSource.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -1,5 +1,6 @@
 .personal-information-mobile {
-  padding: 0.44rem 0.32rem;
+  height: 3.24rem;
+  padding: 0.32rem;
   box-sizing: border-box;
 }
 .personal-information-mobile .top {
@@ -44,9 +45,8 @@
   margin: 0;
 }
 .personal-information-mobile .top .pInfoWrap .userInfo .name {
-  font-family: Montserrat;
-  font-size: 0.32rem;
-  font-weight: 600;
+  font-size: 0.28rem;
+  font-weight: 500;
   color: #ffffff;
   max-width: 2.96rem;
   white-space: nowrap;
@@ -55,9 +55,8 @@
   word-break: break-all;
 }
 .personal-information-mobile .top .pInfoWrap .userInfo .phone {
-  font-family: Montserrat;
-  font-size: 0.32rem;
-  font-weight: 600;
+  font-size: 0.28rem;
+  font-weight: 400;
   color: #ffffff;
   margin-top: 0.1rem;
 }
@@ -71,8 +70,8 @@
   border-radius: 50%;
 }
 .personal-information-mobile .top .pInfoWrap .btnLogin {
-  font-size: 0.32rem;
-  font-weight: 600;
+  font-size: 0.28rem;
+  font-weight: 400;
   color: #ffffff;
   font-family: Montserrat;
 }

package/lib/utils/androidUtil.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.sendToJs = exports.sendToIos = exports.sendToApp = exports.sendToAndroid = exports.iosSendToJs = exports.goToLoginApp = exports.connectWebViewJavascriptBridge = exports.browserVersion = void 0;
 
+var _commonUtil = require("./commonUtil");
+
 // 判断访问终端
 var browserVersion = function browserVersion() {
   var u = navigator.userAgent;
@@ -139,9 +141,15 @@ exports.sendToApp = sendToApp;
 
 var goToLoginApp = function goToLoginApp() {
   if (browserVersion().ditoAndroidApp) {
-    window.dito.goToLogin();
+    var deviceInfo = JSON.parse(window.dito.ocSetDeviceInfo());
+
+    if ((0, _commonUtil.compareVersion)(deviceInfo.AppVersion, '2.11.22') < 0) {
+      window.dito.goToLogin();
+    } else {
+      window.dito.goToLogin('');
+    }
   } else if (browserVersion().ditoIosApp) {
-    window.dito.goToLogin();
+    window.dito.goToLogin(window.location.href);
   }
 };
 

package/lib/utils/commonUtil.js

@@ -7,7 +7,7 @@ exports.addZero = exports.addUrlQuery = void 0;
 exports.asyncDataURLtoImage = asyncDataURLtoImage;
 exports.checkLogin = exports.checkFileName = exports.calcLastTime = exports.asyncNextTick = void 0;
 exports.commonFetch = commonFetch;
-exports.convertCount = exports.compatibleNewPageData = void 0;
+exports.convertCount = exports.compatibleNewPageData = exports.compareVersion = void 0;
 exports.convertImageUrl = convertImageUrl;
 exports.convertToRem = void 0;
 exports.copy2ClipBoard = copy2ClipBoard;
@@ -546,9 +546,31 @@ function convertImageUrl(imageObj, type) {
     return encodeURI(imageObj[typeMap] || imageObj.url);
   }, '');
 }
+
+var compareVersion = function compareVersion(v1, v2) {
+  // 将两个版本号拆成数组
+  var arr1 = v1.split('.');
+  var arr2 = v2.split('.');
+  var minLength = Math.min(arr1.length, arr2.length); // 依次比较版本号每一位大小
+
+  for (var i = 0; i < minLength; i += 1) {
+    if (parseInt(arr1[i], 10) !== parseInt(arr2[i], 10)) {
+      return parseInt(arr1[i], 10) > parseInt(arr2[i], 10) ? 1 : -1;
+    }
+  } // 若前几位分隔相同，则按分隔数比较。
+
+
+  if (arr1.length === arr2.length) {
+    return 0;
+  }
+
+  return arr1.length > arr2.length ? 1 : -1;
+};
 /** 序列化 style对象 */
 
 
+exports.compareVersion = compareVersion;
+
 var styleStringify = function styleStringify(style, _a) {
   var _b = (_a === void 0 ? {} : _a).suffix,
       suffix = _b === void 0 ? 'px' : _b;

package/package.json

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