@fonixtree/magic-design 2.0.202 → 2.0.203

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setAccountPageValue = exports.pInfoData = exports["default"] = void 0;
+exports.setAccountPageValue = exports.pInfoData = exports.orderData = exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -15,6 +15,8 @@ var _antd = require("antd4");
 
 var _avatar = _interopRequireDefault(require("./images/avatar.png"));
 
+var _coreUtil = require("../../../../../utils/coreUtil");
+
 var _components = require("../../../../../meta-comp/components");
 
 var _androidUtil = require("../../../../../utils/androidUtil");
@@ -220,6 +222,20 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
+var currentUser = JSON.parse(localStorage.getItem('currentUser')) || {};
+
+var setAccountPageValue = function setAccountPageValue(obj) {
+  var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
+  localStorage.setItem('accountPageValue', JSON.stringify(__assign(__assign({}, accountPageValue), obj)));
+};
+
+exports.setAccountPageValue = setAccountPageValue;
+
+var getAccountPageValue = function getAccountPageValue(key) {
+  var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
+  return accountPageValue ? accountPageValue[key] || '' : '';
+};
+
 var pInfoData = {
   Wishlist: {
     route: '/favourite/list'
@@ -235,15 +251,29 @@ var pInfoData = {
   }
 };
 exports.pInfoData = pInfoData;
-var LPObj = (0, _storeUtil.getSessionStore)('channelPurchase') || {};
-var currentUser = JSON.parse(localStorage.getItem('currentUser')) || {};
-
-var setAccountPageValue = function setAccountPageValue(obj) {
-  var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
-  localStorage.setItem('accountPageValue', JSON.stringify(__assign(__assign({}, accountPageValue), obj)));
+var orderData = {
+  'To Pay': {
+    key: 'toPayNum',
+    route: '/main/order/1'
+  },
+  'To Ship': {
+    key: 'toDeliveryNum',
+    route: '/main/order/2'
+  },
+  'To Receive': {
+    key: 'toReceiveNum',
+    route: '/main/order/3'
+  },
+  Done: {
+    key: 'toRatingNum',
+    route: '/main/order/4'
+  },
+  Cancelled: {
+    key: 'returnsNum',
+    route: '/main/order/5'
+  }
 };
-
-exports.setAccountPageValue = setAccountPageValue;
+exports.orderData = orderData;
 
 var PersonalInfoMobile =
 /** @class */
@@ -258,7 +288,8 @@ function (_super) {
       userInfo: currentUser,
       loading: false,
       selectedImgFile: {},
-      editImgModalVisible: false
+      editImgModalVisible: false,
+      orderStatus: getAccountPageValue('orderStatus') || {}
     };
 
     _this.getNum = function (v) {
@@ -309,6 +340,8 @@ function (_super) {
     };
 
     _this.clickName = function () {
+      var LPObj = (0, _storeUtil.getSessionStore)('channelPurchase') || {};
+
       if (!(0, _isEmpty["default"])(LPObj)) {
         return;
       }
@@ -406,7 +439,6 @@ function (_super) {
 
     _this.hideBottomBar = function () {
       var homeNavBar = document.querySelector('.home-navigation');
-      console.log('homeNavBar', homeNavBar);
       if (homeNavBar) homeNavBar.style.visibility = 'hidden';
     };
 
@@ -471,6 +503,57 @@ function (_super) {
       }
     };
 
+    _this.onOrderItemClick = function (v) {
+      var _a;
+
+      if ((0, _commonUtil.checkLogin)(true)) {
+        var routeUrl = (_a = orderData[v]) === null || _a === void 0 ? void 0 : _a.route;
+        var selfUrl = (0, _commonUtil.ensure)(function () {
+          return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
+        }, '');
+        (0, _commonUtil.navigateTo)(routeUrl || selfUrl);
+      }
+    };
+
+    _this.getInit = function () {
+      return __awaiter(_this, void 0, void 0, function () {
+        var orderStatus;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
+            case 0:
+              return [4
+              /*yield*/
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/orders/status/num', {}, 'GET')];
+
+            case 1:
+              orderStatus = _a.sent();
+              this.setState({
+                orderStatus: orderStatus
+              });
+              setAccountPageValue({
+                orderStatus: orderStatus
+              });
+              return [2
+              /*return*/
+              ];
+          }
+        });
+      });
+    };
+
+    _this.getImageHtml = function (item) {
+      var orderStatus = _this.state.orderStatus;
+      var num = (0, _commonUtil.ensure)(function () {
+        return orderStatus[orderData[item.sourceType].key];
+      }, '');
+      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+        data: item.image,
+        maxWidth: "100%"
+      }), num ? /*#__PURE__*/_react["default"].createElement("span", {
+        className: "pot"
+      }, num) : null);
+    };
+
     return _this;
   }
 
@@ -480,6 +563,10 @@ function (_super) {
     }
 
     this.getMessageNum();
+
+    if ((0, _commonUtil.isLogin)()) {
+      this.getInit();
+    }
   };
 
   PersonalInfoMobile.prototype.render = function () {
@@ -491,8 +578,11 @@ function (_super) {
         userInfo = _a.userInfo,
         editImgModalVisible = _a.editImgModalVisible,
         selectedImgFile = _a.selectedImgFile;
+    var LPObj = (0, _storeUtil.getSessionStore)('channelPurchase') || {};
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])('personal-information-mobile')
+      className: (0, _classnames["default"])('personal-information-mobile', {
+        higher: (0, _commonUtil.isLogin)() || (0, _coreUtil.isDesignMode)()
+      })
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "top"
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -541,7 +631,7 @@ function (_super) {
       color: "#fff",
       onClick: this.goSettings,
       size: 24,
-      type: "icon-set"
+      type: "icon-settings"
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "iconWrap"
     }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
@@ -551,7 +641,7 @@ function (_super) {
       type: "icon-messages"
     }), !!messageNum && /*#__PURE__*/_react["default"].createElement("span", {
       className: "num"
-    }, messageNum)))), /*#__PURE__*/_react["default"].createElement("div", {
+    }, messageNum)))), ((0, _commonUtil.isLogin)() || (0, _coreUtil.isDesignMode)()) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "bottom"
     }, data.groupSource.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement("div", {
@@ -577,7 +667,49 @@ function (_super) {
           item.title.text = text;
         }
       })));
-    })), editImgModalVisible && /*#__PURE__*/_react["default"].createElement(_common.CropperModal, {
+    })), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "orders"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "fixed-wrap"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "top"
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: "title"
+    }, (0, _locale.i18n)('ORDERS')), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "btn-wrap"
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: "text",
+      onClick: function onClick() {
+        if ((0, _commonUtil.checkLogin)(true)) (0, _commonUtil.navigateTo)('/main/order/0');
+      }
+    }, (0, _locale.i18n)('VIEW_ALL_ORDERS')), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+      color: "#C7C7C7",
+      size: 13,
+      type: "icon-outlined-right"
+    }))), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "list"
+    }, data.groupSource2.map(function (item) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        key: item.id,
+        className: "item",
+        onClick: function onClick() {
+          return _this.onOrderItemClick(item.sourceType);
+        }
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "content-wrap",
+        style: {
+          pointerEvents: window.magicDesign.mode == 'designer' ? 'auto' : 'none'
+        }
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "img-wrap"
+      }, item.image.open && _this.getImageHtml(item)), item.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+        className: "title",
+        data: item.title,
+        onTextInput: function onTextInput(text) {
+          item.title.text = text;
+        }
+      })));
+    })))), editImgModalVisible && /*#__PURE__*/_react["default"].createElement(_common.CropperModal, {
       onClose: function onClose() {
         _this.setState({
           editImgModalVisible: false

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

@@ -1,7 +1,11 @@
 .personal-information-mobile {
-  height: 3.24rem;
-  padding: 0.32rem;
+  padding: 0.44rem 0.32rem;
   box-sizing: border-box;
+  height: 5rem;
+}
+.personal-information-mobile.higher {
+  border-bottom: 1.52rem solid #fff;
+  height: 6.8rem;
 }
 .personal-information-mobile .top {
   display: flex;
@@ -45,8 +49,9 @@
   margin: 0;
 }
 .personal-information-mobile .top .pInfoWrap .userInfo .name {
-  font-size: 0.28rem;
-  font-weight: 500;
+  font-family: Montserrat;
+  font-size: 0.32rem;
+  font-weight: 600;
   color: #ffffff;
   max-width: 2.96rem;
   white-space: nowrap;
@@ -55,8 +60,9 @@
   word-break: break-all;
 }
 .personal-information-mobile .top .pInfoWrap .userInfo .phone {
-  font-size: 0.28rem;
-  font-weight: 400;
+  font-family: Montserrat;
+  font-size: 0.32rem;
+  font-weight: 600;
   color: #ffffff;
   margin-top: 0.1rem;
 }
@@ -70,8 +76,8 @@
   border-radius: 50%;
 }
 .personal-information-mobile .top .pInfoWrap .btnLogin {
-  font-size: 0.28rem;
-  font-weight: 400;
+  font-size: 0.32rem;
+  font-weight: 600;
   color: #ffffff;
   font-family: Montserrat;
 }
@@ -141,3 +147,89 @@
   line-height: 0.32rem;
   text-align: center;
 }
+.personal-information-mobile .orders {
+  margin-top: 0.48rem;
+}
+.personal-information-mobile .orders .fixed-wrap {
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+  box-shadow: 0 0.06rem 0.12rem rgba(0, 0, 0, 0.16);
+  border-radius: 0.32rem;
+  width: auto;
+  padding: 0.32rem;
+}
+.personal-information-mobile .orders .fixed-wrap .top {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  font-weight: 600;
+  line-height: 0.36rem;
+  color: var(--font-color);
+}
+.personal-information-mobile .orders .fixed-wrap .top .title {
+  font-size: 0.28rem;
+  font-weight: 600;
+  color: #2C2C2C;
+}
+.personal-information-mobile .orders .fixed-wrap .top .btn-wrap {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+}
+.personal-information-mobile .orders .fixed-wrap .top .btn-wrap .text {
+  font-size: 0.28rem;
+  color: #929292;
+  font-weight: 400;
+  margin-right: 0.08rem;
+}
+.personal-information-mobile .orders .fixed-wrap .list {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  height: 1.32rem;
+  margin-top: 0.48rem;
+  margin-bottom: 0.02rem;
+}
+.personal-information-mobile .orders .fixed-wrap .list .item {
+  display: flex;
+  flex: 1 1;
+}
+.personal-information-mobile .orders .fixed-wrap .list .item .content-wrap {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.personal-information-mobile .orders .fixed-wrap .list .item .img-wrap {
+  position: relative;
+  display: flex;
+  margin-bottom: 0.16rem;
+  width: 0.72rem;
+  height: 0.72rem;
+}
+.personal-information-mobile .orders .fixed-wrap .list .item .img-wrap .pot {
+  display: inline-block;
+  padding: 0 0.08rem;
+  background: #ce1126;
+  border: 0.02rem solid #ce1126;
+  font-size: 0.16rem;
+  text-align: center;
+  color: #fff;
+  position: absolute;
+  top: -0.04rem;
+  left: 0.4rem;
+  min-width: 0.32rem;
+  height: 0.32rem;
+  border-radius: 50%;
+  line-height: 0.3rem;
+}
+.personal-information-mobile .orders .fixed-wrap .list .item .title {
+  height: 0.44rem;
+  font-size: 0.24rem;
+  line-height: 0.22rem;
+  color: #2C2C2C;
+  text-align: center;
+}

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

@@ -270,6 +270,73 @@ var LAYOUT_IMAGE_SIZE = {
     h: 110
   }
 };
+/**
+ * 将第二个数组随机插入到第一个数组中
+ * @param {Array} array1 - 第一个数组
+ * @param {Array} array2 - 第二个数组
+ * @returns {Array} - 返回合并后的新数组
+ */
+
+var insertArrayRandomly = function insertArrayRandomly(arr1, arr2) {
+  if (arr1.length < 1) {
+    return [];
+  }
+
+  if (arr1.length < 2) {
+    return __spreadArrays(arr1, arr2);
+  }
+
+  if (arr1.length === 2) {
+    return __spreadArrays([arr1[0]], arr2, [arr1[1]]);
+  }
+
+  if (arr1.length === 3) {
+    return __spreadArrays([arr1[0]], arr2, arr1.splice(1));
+  } // 创建一个复制的第一个数组，以免修改原数组
+
+
+  var result = __spreadArrays(arr1); // 记录已插入元素的位置
+
+
+  var insertedIndices = [];
+
+  var _loop_1 = function _loop_1(i) {
+    var randomIndex; // 确保生成的随机索引不在首尾，并且与已插入的索引相隔至少两个位置
+
+    do {
+      randomIndex = Math.floor(Math.random() * (result.length - 2)) + 1; // 1 到 result.length - 2
+      // eslint-disable-next-line no-loop-func
+    } while (insertedIndices.some(function (index) {
+      return Math.abs(index - randomIndex) < 2;
+    })); // 在随机位置插入第二个数组的元素
+
+
+    result.splice(randomIndex, 0, arr2[i]); // 记录已插入的位置
+
+    insertedIndices.push(randomIndex);
+  }; // 随机插入第二个数组的元素
+  // eslint-disable-next-line no-plusplus
+
+
+  for (var i = 0; i < arr2.length; i++) {
+    _loop_1(i);
+  }
+
+  return result;
+};
+
+var getRandomItemsAndRemove = function getRandomItemsAndRemove(arr, list) {
+  var _count = Math.ceil(list.length / 5);
+
+  var result = []; // eslint-disable-next-line no-plusplus
+
+  for (var i = 0; i < _count && arr.length > 0; i++) {
+    var randomIndex = Math.floor(Math.random() * arr.length);
+    result.push(arr.splice(randomIndex, 1)[0]);
+  }
+
+  return result;
+};
 
 var RecommendMobile =
 /** @class */
@@ -279,6 +346,7 @@ function (_super) {
   function RecommendMobile() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
+    _this.ads = [];
     _this.preData = {};
     _this.preLayout = '';
     _this.preContent = '';
@@ -328,16 +396,49 @@ function (_super) {
       }, '#CE1126') : '#CE1126';
     };
 
+    _this.getAdvertise = function () {
+      return __awaiter(_this, void 0, void 0, function () {
+        var ad;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
+            case 0:
+              return [4
+              /*yield*/
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/ad/today/valid/MagicDesignRecommendation/list', {}, 'GET')];
+
+            case 1:
+              ad = _a.sent();
+
+              if (ad === null || ad === void 0 ? void 0 : ad.length) {
+                return [2
+                /*return*/
+                , ad[0].advertiseContents.map(function (it) {
+                  return {
+                    type: 'ad',
+                    url: it === null || it === void 0 ? void 0 : it.url,
+                    adObj: it
+                  };
+                })];
+              }
+
+              return [2
+              /*return*/
+              , []];
+          }
+        });
+      });
+    };
+
     _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, prodType, _e, intelligentType, _f, intelligentValue, _g, maxProdNum, newData, params, res, res, e_1, _h, insertAds, _cache;
 
-        var _h, _j, _k;
+        var _j, _k, _l;
 
         var _this = this;
 
-        return __generator(this, function (_l) {
-          switch (_l.label) {
+        return __generator(this, function (_m) {
+          switch (_m.label) {
             case 0:
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
@@ -349,7 +450,7 @@ function (_super) {
 
                 if (cache) {
                   if ("products" + index in cache) {
-                    this.setState((_h = {}, _h["products" + index] = cache["products" + index], _h), function () {
+                    this.setState((_j = {}, _j["products" + index] = cache["products" + index], _j), function () {
                       _this.resetLayout();
                     });
                     /** 如果数据未过期 */
@@ -363,10 +464,10 @@ 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;
               newData = [];
-              _l.label = 1;
+              _m.label = 1;
 
             case 1:
-              _l.trys.push([1, 9,, 10]);
+              _m.trys.push([1, 9,, 10]);
 
               if (!(groupSource.length > 0)) return [3
               /*break*/
@@ -392,7 +493,7 @@ function (_super) {
               , (0, _commonUtil.commonFetch)('/designer/v1/h5/products', params, 'GET')];
 
             case 2:
-              res = _l.sent();
+              res = _m.sent();
               newData = __spreadArrays(res.list);
               return [3
               /*break*/
@@ -415,7 +516,7 @@ function (_super) {
               }, 'POST')];
 
             case 4:
-              res = _l.sent();
+              res = _m.sent();
               newData = __spreadArrays(res.pageInfo.list);
               return [3
               /*break*/
@@ -423,7 +524,7 @@ function (_super) {
 
             case 5:
               newData = [];
-              _l.label = 6;
+              _m.label = 6;
 
             case 6:
               return [3
@@ -432,7 +533,7 @@ function (_super) {
 
             case 7:
               newData = [];
-              _l.label = 8;
+              _m.label = 8;
 
             case 8:
               return [3
@@ -440,19 +541,34 @@ function (_super) {
               , 10];
 
             case 9:
-              e_1 = _l.sent();
+              e_1 = _m.sent();
               newData = [];
               return [3
               /*break*/
               , 10];
 
             case 10:
+              if (!window.magicDesign.showRecommendAds) return [3
+              /*break*/
+              , 12];
+              _h = this;
+              return [4
+              /*yield*/
+              , this.getAdvertise()];
+
+            case 11:
+              _h.ads = _m.sent();
+              insertAds = getRandomItemsAndRemove(this.ads, newData);
+              newData = insertArrayRandomly(newData, insertAds);
+              _m.label = 12;
+
+            case 12:
               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), (_k = {}, _k["products" + index] = newData, _k.endTime = Date.now() + 3 * 60 * 1000, _k)));
               }
 
-              this.setState((_k = {}, _k["products" + index] = newData, _k), function () {
+              this.setState((_l = {}, _l["products" + index] = newData, _l), function () {
                 _this.resetLayout();
               });
               return [2

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

@@ -31,6 +31,8 @@ var _coreUtil = require("../../../../../utils/coreUtil");
 
 var _mobx = require("../../../../../mobx");
 
+var _locale = require("../../../../../locale");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -89,16 +91,6 @@ function (_super) {
     _this.carouselRef = /*#__PURE__*/_react["default"].createRef();
     _this.destroy = null;
 
-    _this.bannerGoto = function (groupSource) {
-      var nextIndex = groupSource.findIndex(function (item) {
-        return item.id === _mobx.store.clickedGroup;
-      });
-
-      if (nextIndex != -1 && nextIndex != _this.state.carouseIndex) {
-        _this.carouselRef.current.goTo(nextIndex);
-      }
-    };
-
     _this.bannerGoto = function (groupSource) {
       var nextIndex = groupSource.findIndex(function (item) {
         return item.id === _mobx.store.clickedGroup;
@@ -251,7 +243,7 @@ function (_super) {
           if (window.magicDesign.pushGA) {
             window.magicDesign.pushGA({}, 'select_promotion', {
               event_section: 'Search_Banner',
-              promotion_name: item.image.content.h5ImgSrc ? item.image.content.h5Name : i18n('BANNER_GROUP_NAME')
+              promotion_name: item.image.content.h5ImgSrc ? item.image.content.h5Name : (0, _locale.i18n)('BANNER_GROUP_NAME')
             });
           }
         }