@titaui/pc 1.10.54 → 1.10.57

package/lib/components/dynamic/dynamic-item/dynamic-report/index.js

@@ -72,7 +72,7 @@ var DynamicReply = function DynamicReply(_ref) {
         actionName: "查看日报",
         actionGroup: "动态-推屏",
         productName: "动态",
-        planId: data.dailyId
+        feedId: data.dailyId
       });
     } // @ts-ignore
 

package/lib/components/dynamic/dynamic-item/index.js

@@ -170,7 +170,7 @@ var DynamicItem = function DynamicItem(_ref) {
           actionName: "查看日报",
           actionGroup: "动态-查看更多",
           productName: "动态",
-          planId: data.dailyId
+          feedId: data.dailyId
         });
       }
     }

package/lib/components/nav-top/components/user-message/components/reply/index.js

@@ -56,8 +56,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var preCls = "titaui-user-message-msg-reply";
 
 function Reply(props) {
-  var onItemClick = props.onItemClick,
-      handleIntervalRequestMessageInfo = props.handleIntervalRequestMessageInfo;
+  var onItemClick = props.onItemClick;
 
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -108,6 +107,10 @@ function Reply(props) {
     }
   };
 
+  var handleDeleteReply = function handleDeleteReply(msgId) {
+    (0, _request.deleteReply)(msgId);
+  };
+
   (0, _react.useEffect)(function () {
     setTimeout(function () {
       (0, _request.getReplys)(1).then(function (res) {
@@ -118,9 +121,6 @@ function Reply(props) {
 
         setIsLoading(false);
       });
-      (0, _request.clearReplys)().then(function () {
-        return handleIntervalRequestMessageInfo();
-      });
     }, 300);
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
@@ -144,7 +144,8 @@ function Reply(props) {
     return /*#__PURE__*/_react["default"].createElement(_replyItem["default"], {
       item: item,
       onItemClick: onItemClick,
-      replys: replys
+      replys: replys,
+      handleDeleteReply: handleDeleteReply
     });
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__footer"))

package/lib/components/nav-top/components/user-message/components/reply/reply-item.js

@@ -30,14 +30,17 @@ var preCls = "titaui-user-message-msg-reply";
 function Reply(props) {
   var item = props.item,
       onItemClick = props.onItemClick,
-      replys = props.replys;
+      replys = props.replys,
+      handleDeleteReply = props.handleDeleteReply;
 
   var handleReplyClick = function handleReplyClick() {
-    onItemClick && onItemClick(false);
+    if (onItemClick) {
+      onItemClick(false);
+    }
   };
 
   var getDescText = function getDescText() {
-    if (item.content.indexOf("@") != -1) {
+    if (item.content.indexOf("@") !== -1) {
       return "@我";
     }
 
@@ -56,8 +59,15 @@ function Reply(props) {
     return (0, _utils.deleteText)((0, _utils.htmlToText)(item.content));
   };
 
-  return /*#__PURE__*/_react["default"].createElement("li", {
-    className: (0, _classnames["default"])("".concat(preCls, "__item"), _defineProperty({}, "".concat(preCls, "__item--scroll"), replys.length >= 4))
+  var handleReplyItemClick = function handleReplyItemClick(msgId) {
+    handleDeleteReply(msgId);
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__item"), _defineProperty({}, "".concat(preCls, "__item--scroll"), replys.length >= 4)),
+    onClick: function onClick() {
+      return handleReplyItemClick(item.msgId);
+    }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__item-photo"))
   }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {

package/lib/components/nav-top/request.apis.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTodos = exports.getReplys = exports.getReminds = exports.getMessages = exports.getInforms = exports.getData = exports.clearReplys = exports.clearInforms = exports.changeLang = void 0;
+exports.getTodos = exports.getReplys = exports.getReminds = exports.getMessages = exports.getInforms = exports.getData = exports.deleteReply = exports.clearReplys = exports.clearInforms = exports.changeLang = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
@@ -65,6 +65,12 @@ var clearReplys = function clearReplys() {
 
 exports.clearReplys = clearReplys;
 
+var deleteReply = function deleteReply(msgId) {
+  return (0, _request.rpost)("v1")("messages/clear?msgId=".concat(msgId));
+};
+
+exports.deleteReply = deleteReply;
+
 var getMessages = function getMessages() {
   var nowTime = new Date();
   var year = nowTime.getFullYear();

package/lib/components/okrcase-library/okrcases-components/submitOkr-dialog.js

@@ -57,23 +57,23 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var Fields = _form["default"].Fields;
-var precls = 'okr-cases-library__pay-window';
+var precls = "okr-cases-library__pay-window";
 
 function SubmitDialog(props) {
   var handleShowSubmitOkrWindow = props.handleShowSubmitOkrWindow,
       isShowSubmitOkrWindow = props.isShowSubmitOkrWindow;
 
-  var _useState = (0, _react.useState)(''),
+  var _useState = (0, _react.useState)(""),
       _useState2 = _slicedToArray(_useState, 2),
       type = _useState2[0],
       setType = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(''),
+  var _useState3 = (0, _react.useState)(""),
       _useState4 = _slicedToArray(_useState3, 2),
       job = _useState4[0],
       setJob = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(''),
+  var _useState5 = (0, _react.useState)(""),
       _useState6 = _slicedToArray(_useState5, 2),
       scene = _useState6[0],
       setScene = _useState6[1];
@@ -93,11 +93,11 @@ function SubmitDialog(props) {
 
     if (!err.length) {
       (0, _network.postSurvey)(body).then(function () {
-        _toast["default"].Success('发送成功');
+        _toast["default"].Success("发送成功");
 
         handleShowSubmitOkrWindow(false);
       })["catch"](function () {
-        _toast["default"].Warning('发送失败');
+        _toast["default"].Warning("发送失败");
       });
     }
   };
@@ -130,7 +130,7 @@ function SubmitDialog(props) {
     placeholder: "\u5982\u9500\u552E\u56E2\u961F",
     require: true,
     verifies: [{
-      tip: 'OKR类型不能为空',
+      tip: "OKR类型不能为空",
       test: /\S/
     }],
     onChange: setType
@@ -140,7 +140,7 @@ function SubmitDialog(props) {
     placeholder: "\u5982\u9500\u552EVP",
     require: true,
     verifies: [{
-      tip: 'OKR岗位不能为空',
+      tip: "OKR岗位不能为空",
       test: /\S/
     }],
     onChange: setJob
@@ -155,7 +155,7 @@ function SubmitDialog(props) {
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "okr-cases-library__submitWindow-submitButton",
     onClick: onSubmitButtonClick
-  }, (0, _getLocale.getLocale)('Pro_detail_Submission'))));
+  }, (0, _getLocale.getLocale)("Pro_detail_Submission"))));
 }
 
 function PayDialog(props) {
@@ -176,38 +176,38 @@ function PayDialog(props) {
     var tenantType = window.BSGlobal.tenantInfo.tenantType; // 外部注冊賬號使用的產品ID不同
 
     // 外部注冊賬號使用的產品ID不同
-    if (Version === 1 && tenantType === 3) return 'D9E059E4-4303-4EE2-9275-AE2FA74BBAA6';
-    return '60AFAD35-5273-4A06-B2F4-9A3193096BE7';
+    if (Version === 1 && tenantType === 3) return "D9E059E4-4303-4EE2-9275-AE2FA74BBAA6";
+    return "60AFAD35-5273-4A06-B2F4-9A3193096BE7";
   }),
       _useState10 = _slicedToArray(_useState9, 1),
       packageId = _useState10[0];
 
-  var _useState11 = (0, _react.useState)(''),
+  var _useState11 = (0, _react.useState)(""),
       _useState12 = _slicedToArray(_useState11, 2),
       orderId = _useState12[0],
       setOrderId = _useState12[1];
 
-  var _useState13 = (0, _react.useState)('wxPay'),
+  var _useState13 = (0, _react.useState)("wxPay"),
       _useState14 = _slicedToArray(_useState13, 2),
       payCode = _useState14[0],
       setPayCode = _useState14[1];
 
-  var _useState15 = (0, _react.useState)('微信'),
+  var _useState15 = (0, _react.useState)("微信"),
       _useState16 = _slicedToArray(_useState15, 2),
       payName = _useState16[0],
       setPayName = _useState16[1];
 
   var _useState17 = (0, _react.useState)({
-    PayCode: 'directPay',
-    PayName: '支付宝'
+    PayCode: "directPay",
+    PayName: "支付宝"
   }),
       _useState18 = _slicedToArray(_useState17, 2),
       wxModel = _useState18[0],
       setWxModel = _useState18[1];
 
   var _useState19 = (0, _react.useState)({
-    PayCode: 'wxPay',
-    PayName: '微信'
+    PayCode: "wxPay",
+    PayName: "微信"
   }),
       _useState20 = _slicedToArray(_useState19, 2),
       aliModel = _useState20[0],
@@ -259,9 +259,9 @@ function PayDialog(props) {
           } else {
             // 订单已支付
             _titaUi.Modal.success({
-              title: '支付成功',
-              content: 'OKR案例库已开通',
-              okText: '立即使用',
+              title: "支付成功",
+              content: "OKR案例库已开通",
+              okText: "立即使用",
               onOk: function () {
                 var _onOk = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
                   return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -300,15 +300,17 @@ function PayDialog(props) {
   };
 
   var clickPayNowHandler = function clickPayNowHandler(e) {
-    if (payCode == 'wxPay') {
+    if (payCode === "wxPay") {
       e.preventDefault();
-      (0, _network.postWxPayOrder)({
-        order_id: orderId,
-        default_bank: payCode,
-        default_bank_name: payName
-      }).then(function (res) {
-        window.open(res, '_blank');
-      });
+      var path = window.location.href.split("#")[0];
+      var encode = encodeURIComponent("orderId=".concat(orderId, "&payCode=").concat(payCode, "&payName=").concat(payName));
+      window.open("".concat(path, "#/pay?").concat(encode), "_blank"); // postWxPayOrder({
+      //   order_id: orderId,
+      //   default_bank: payCode,
+      //   default_bank_name: payName,
+      // }).then((res) => {
+      //   window.open(res, '_blank')
+      // })
     }
 
     loopOrderInfo(orderId);
@@ -335,43 +337,45 @@ function PayDialog(props) {
       return handleShowPayWindow(false);
     },
     style: {
-      width: '18px',
-      height: '18px'
+      width: "18px",
+      height: "18px"
     }
   }), /*#__PURE__*/_react["default"].createElement("p", {
     className: "".concat(precls, "__head")
-  }, price, " \u8D2D\u4E70\u5343\u4EFD OKR \u6848\u4F8B\u5E93"), /*#__PURE__*/_react["default"].createElement("p", {
+  }, price, " ", "\u8D2D\u4E70\u5343\u4EFD OKR \u6848\u4F8B\u5E93"), /*#__PURE__*/_react["default"].createElement("p", {
     className: "".concat(precls, "__detail")
   }, "\u53EF\u67E5\u770B \u4F7F\u7528\u6848\u4F8B\u5E93\u6240\u6709\u884C\u4E1A\u7684\u6848\u4F8B", /*#__PURE__*/_react["default"].createElement("a", {
     href: "https://club.tita.com/okr-examples",
     target: "_blank",
     rel: "noreferrer"
-  }, (0, _getLocale.getLocale)('Mod_Checkdetails'))), /*#__PURE__*/_react["default"].createElement("div", {
+  }, (0, _getLocale.getLocale)("Mod_Checkdetails"))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(precls, "__amount")
   }, "\u5E94\u4ED8\u91D1\u989D\uFF1A", /*#__PURE__*/_react["default"].createElement("b", null, /*#__PURE__*/_react["default"].createElement("span", {
     style: {
-      fontSize: '32px'
+      fontSize: "32px"
     }
   }, "29.8"), "\u5143/\u5E74")), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(precls, "__type")
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(precls, "__commit-order"), "".concat(precls, "__commit-order--wx"), _defineProperty({}, "".concat(precls, "__commit-order--active"), payCode == (wxModel === null || wxModel === void 0 ? void 0 : wxModel.PayCode))),
+    className: (0, _classnames["default"])("".concat(precls, "__commit-order"), "".concat(precls, "__commit-order--wx"), _defineProperty({}, "".concat(precls, "__commit-order--active"), payCode === (wxModel === null || wxModel === void 0 ? void 0 : wxModel.PayCode))),
     onClick: function onClick() {
       return onPayOrderChange(wxModel);
     }
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: _wxPay["default"],
+    alt: "",
     width: 20,
     style: {
       marginRight: 4
     }
   }), "\u5FAE\u4FE1\u652F\u4ED8"), /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(precls, "__commit-order"), _defineProperty({}, "".concat(precls, "__commit-order--active"), payCode == (aliModel === null || aliModel === void 0 ? void 0 : aliModel.PayCode))),
+    className: (0, _classnames["default"])("".concat(precls, "__commit-order"), _defineProperty({}, "".concat(precls, "__commit-order--active"), payCode === (aliModel === null || aliModel === void 0 ? void 0 : aliModel.PayCode))),
     onClick: function onClick() {
       return onPayOrderChange(aliModel);
     }
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: _aliPay["default"],
+    alt: "",
     width: 20,
     style: {
       marginRight: 4

package/lib/index.js

@@ -327,6 +327,12 @@ Object.defineProperty(exports, "PasswordInput", {
     return _passwordInput["default"];
   }
 });
+Object.defineProperty(exports, "PayPage", {
+  enumerable: true,
+  get: function get() {
+    return _pay["default"];
+  }
+});
 Object.defineProperty(exports, "PeriodSelector", {
   enumerable: true,
   get: function get() {
@@ -744,6 +750,8 @@ var _uploadPhotoModal = _interopRequireDefault(require("./components/upload-phot
 
 var _bookDemo = _interopRequireDefault(require("./components/book-demo"));
 
+var _pay = _interopRequireDefault(require("./pages/pay"));
+
 var _richEditor = _interopRequireDefault(require("./components/rich-editor"));
 
 var _videoModal = _interopRequireDefault(require("./components/video-modal"));

package/lib/pages/new-okr-list/header/index.js

@@ -154,7 +154,8 @@ function Header(props, ref) {
       annualNum: annualNum,
       yqmNum: yqmNum
     })), "rootNode=".concat(JSON.stringify(rootNode)), "level2Selected=".concat(JSON.stringify(level2Selected))].join("&");
-    window.location.href = "".concat(window.location.origin, "/#okr/map?").concat(urlQuery);
+    var origin = window.location.href.split('#')[0];
+    window.location.href = "".concat(origin, "/#okr/map?").concat(urlQuery);
   };
 
   var getTitle = function getTitle() {

package/lib/pages/pay/index.css

@@ -0,0 +1,79 @@
+.tita-pay-page {
+  width: 100vw;
+  height: 100vh;
+  background: linear-gradient(180deg, #e9f1ff 0%, rgba(233, 241, 255, 0) 100%);
+  position: relative;
+}
+
+.tita-pay-page-layout {
+  position: absolute;
+  top: calc(50% - 40px);
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.tita-pay-page__title {
+  display: flex;
+  justify-content: center;
+}
+
+.tita-pay-page__card {
+  width: 444px;
+  height: 469px;
+  background: #ffffff;
+  box-shadow: 0px 12px 20px 0px rgba(127, 145, 180, 0.2);
+  border-radius: 24px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-top: 21px;
+}
+
+.tita-pay-page__card__success-image {
+  width: 194px;
+  height: 194px;
+  margin-top: 76px;
+}
+
+.tita-pay-page__card__success-message {
+  font-weight: 600;
+  margin-top: 28px;
+  font-size: 20px;
+  color: #3f4755;
+  line-height: 32px;
+}
+
+.tita-pay-page__card__success-promptMes {
+  font-size: 14px;
+  font-weight: 400;
+  color: #3f4755;
+  line-height: 22px;
+  margin-top: 12px;
+}
+
+.tita-pay-page__card-title {
+  font-size: 20px;
+  color: #141c28;
+  line-height: 30px;
+  margin-top: 44px;
+}
+
+.tita-pay-page__card-price {
+  margin: 12px 0 17px;
+}
+
+.tita-pay-page__card-qrcode {
+  width: 240px;
+}
+
+.tita-pay-page__card-qrcode > img {
+  width: 100%;
+}
+
+.tita-pay-page__card-promptMes {
+  margin-top: 20px;
+  font-size: 16px;
+  font-weight: 400;
+  color: #3f4755;
+  line-height: 22px;
+}

package/lib/pages/pay/index.js

@@ -0,0 +1,66 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _success = _interopRequireDefault(require("./image/success.png"));
+
+require("./index.css");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var preCls = "tita-pay-page";
+
+var payPage = function payPage(_ref) {
+  var title = _ref.title,
+      cardTitle = _ref.cardTitle,
+      price = _ref.price,
+      qrcode = _ref.qrcode,
+      promptMes = _ref.promptMes,
+      isSuccessPay = _ref.isSuccessPay,
+      successMes = _ref.successMes;
+
+  var renderSuccessCard = function renderSuccessCard() {
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("img", {
+      className: "".concat(preCls, "__card__success-image"),
+      src: _success["default"],
+      alt: ""
+    }), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__card__success-message")
+    }, "\u606D\u559C\u60A8\uFF0C\u652F\u4ED8\u6210\u529F"), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__card__success-promptMes")
+    }, successMes));
+  };
+
+  var renderCard = function renderCard() {
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__card-title")
+    }, cardTitle), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__card-price")
+    }, price), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__card-qrcode")
+    }, /*#__PURE__*/_react["default"].createElement("img", {
+      src: qrcode,
+      alt: ""
+    })), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__card-promptMes")
+    }, qrcode ? promptMes : "订单获取失败，请返回重试"));
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls)
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "-layout")
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__title")
+  }, title), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__card")
+  }, isSuccessPay ? renderSuccessCard() : renderCard())));
+};
+
+var _default = payPage;
+exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.10.54",
+  "version": "1.10.57",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",