@titaui/pc 1.9.151 → 1.10.2

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

@@ -172,6 +172,11 @@ function Inform(props) {
         return;
       }
 
+      if (objId && objType == 74) {
+        window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#performance?formId=").concat(item.objId, "&reactRouterName=detail"));
+        return;
+      }
+
       var reg = /href='.*?(?=')/g;
       var url = "";
       item.content.replace(reg, function ($0) {

package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/index.css

@@ -379,7 +379,7 @@
 .tita-okrdt-tree__e-empty-node {
   font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
-  color: #F6BD16;
+  color: #A4ACB9;
   line-height: 18px;
   padding-left: 12px;
 }

package/lib/components/okrcase-library/image/ali-pay.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>支付宝支付</title>
+    <g id="OKR-案例库" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g transform="translate(-642.000000, -460.000000)" fill="#2879FF" fill-rule="nonzero" id="支付购买">
+            <g transform="translate(329.000000, 208.000000)">
+                <g id="编组-2" transform="translate(300.000000, 240.000000)">
+                    <g id="编组-4" transform="translate(13.000000, 12.000000)">
+                        <path d="M4.49988762,11.2596921 C4.26387952,11.4507248 4.00988986,11.7271604 3.93796359,12.080009 C3.83906496,12.5609619 3.91773432,13.1655242 4.38300742,13.6374874 C4.94493145,14.2105855 5.80130366,14.3679065 6.17217352,14.3948758 C7.17689368,14.466794 8.24679703,13.970109 9.05371994,13.4015058 C9.37064509,13.1790089 9.91009216,12.7317676 10.42931,12.039555 C9.26949876,11.441735 7.82198247,10.7787392 6.27556754,10.843915 C5.47988312,10.8776267 4.9134637,11.0416901 4.49988762,11.2596921 L4.49988762,11.2596921 Z M19.2043156,13.9071806 C19.7167903,12.7070457 20,11.3855489 20,9.99887628 C20,4.48589729 15.5135986,0 10,0 C4.48415374,0.00224744353 0,4.48814474 0,10.0011237 C0,15.5141027 4.48640144,20 10,20 C13.3288379,20 16.2800629,18.3661086 18.0984491,15.8579616 C16.3789616,15.0016856 13.5468645,13.5970334 11.8004046,12.7452523 C10.968757,13.6936734 9.73701955,14.6443421 8.34569566,15.0601191 C7.47134187,15.3185751 6.68464824,15.4197101 5.86199146,15.2511518 C5.04607777,15.084841 4.44594291,14.7027756 4.09530232,14.3207102 C3.91773432,14.1251826 3.71319398,13.8779638 3.56484603,13.5813013 C3.57833221,13.6195078 3.58732299,13.6419822 3.58732299,13.6419822 C3.58732299,13.6419822 3.50191054,13.4958984 3.43672735,13.2621643 C3.40301191,13.1497921 3.38053495,13.0306776 3.37154417,12.9070682 C3.36480108,12.8261602 3.36255338,12.7407574 3.36704878,12.6531071 C3.36030569,12.5025284 3.36480108,12.3452073 3.40076422,12.1833914 C3.48168128,11.7878413 3.65025849,11.3271154 4.08855923,10.9001011 C5.04607777,9.96291718 6.32951225,9.91122598 6.9948303,9.91572087 C7.9793212,9.92021575 9.69206563,10.3517249 11.1328388,10.8618946 C11.5329287,10.0123609 11.7869184,9.10214631 11.9532479,8.497584 L5.96313778,8.497584 L5.96313778,7.85032026 L9.04023376,7.85032026 L9.04023376,6.55579279 L5.31355361,6.55579279 L5.31355361,5.90852905 L9.03798606,5.90852905 L9.03798606,4.60725924 C9.03798606,4.4297112 9.0739492,4.28362737 9.3616543,4.28362737 L10.8181614,4.28362737 L10.8181614,5.90178672 L14.8662621,5.90178672 L14.8662621,6.54905046 L10.8204091,6.54905046 L10.8204091,7.84357793 L14.0593392,7.84357793 C14.0593392,7.84357793 13.7334232,9.65726486 12.7174646,11.4439825 C14.9741515,12.2508147 18.1478984,13.493651 19.2043156,13.9071806 Z" id="形状"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

package/lib/components/okrcase-library/image/select-pay-order.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="14px" viewBox="0 0 21 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>勾选</title>
+    <g id="OKR-案例库" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g transform="translate(-572.000000, -448.000000)" fill="#2879FF" id="支付购买">
+            <g transform="translate(329.000000, 208.000000)">
+                <g id="编组-2" transform="translate(144.000000, 240.000000)">
+                    <g id="勾选" transform="translate(99.000000, 0.000000)">
+                        <path d="M14,0 C17.8659932,-7.10171439e-16 21,3.13400675 21,7 L21,14 L8.65891053,14 C5.35814605,14 2.50589981,11.6941991 1.81429363,8.46670362 L0,0 L14,0 Z M15.19775,2.75 C12.1745,4.29425 10.2605,8.93135 10.2605,8.93135 L10.2605,8.93135 L9.086,6.6476 L6.65,8.1092 C7.6766,8.47895 9.1556,9.6578 10.41275,11.2151 C11.30015,9.60125 14.02325,6.2909 15.35,5.99075 C14.83235,4.8119 15.1325,3.8549 15.19775,2.75 Z" id="形状结合"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

package/lib/components/okrcase-library/image/wx-pay.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>微信支付</title>
+    <g id="OKR-案例库" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g transform="translate(-493.000000, -460.000000)" fill="#09BB07" fill-rule="nonzero" id="支付购买">
+            <g transform="translate(329.000000, 208.000000)">
+                <g id="编组-2" transform="translate(144.000000, 240.000000)">
+                    <g id="微信支付" transform="translate(20.000000, 12.000000)">
+                        <path d="M7.27765128,12.3644487 C7.18575281,12.4123765 7.09165121,12.4352511 6.97741679,12.4352511 C6.72194794,12.4352511 6.51356504,12.2936463 6.39701031,12.0812392 L6.34999467,11.9877074 L4.51938458,7.92321471 C4.49697832,7.87528694 4.49697832,7.82965874 4.49697832,7.78173097 C4.49697832,7.59219842 4.63591587,7.45059365 4.82189251,7.45059365 C4.89138472,7.45059365 4.96083006,7.47344406 5.03032228,7.52137183 L7.18575281,9.08096081 C7.34709662,9.17449258 7.53309669,9.24531918 7.74140927,9.24531918 C7.85794057,9.24531918 7.97226874,9.22244456 8.08880003,9.17449258 L18.196343,4.59177482 C16.3881627,2.41798421 13.3990599,1 10.0134883,1 C4.49697832,1 0,4.80415777 0,9.50340295 C0,12.0539349 1.34439896,14.3692092 3.45288416,15.9287982 C3.61413422,16.0475284 3.73066552,16.2599355 3.73066552,16.4722217 C3.73066552,16.543024 3.70823582,16.6138264 3.68364988,16.6846288 C3.52237638,17.3216809 3.24229814,18.3629238 3.24229814,18.4086488 C3.21984501,18.4793301 3.19511844,18.5730071 3.19511844,18.6688627 C3.19511844,18.8583952 3.33407943,19 3.5200795,19 C3.58952484,19 3.65901705,18.9771496 3.70605614,18.9291976 L5.88391636,17.6299678 C6.04528361,17.5362908 6.23126025,17.4655126 6.41726032,17.4655126 C6.50904161,17.4655126 6.62559634,17.488363 6.71749481,17.5134404 C7.73693271,17.8195003 8.85058939,17.9861824 9.98655859,17.9861824 C15.503092,17.9861824 20,14.1820247 20,9.48277949 C20,8.06479528 19.5832811,6.7198404 18.8640542,5.53713797 L7.34709662,12.3164968 L7.27765128,12.3644245 L7.27765128,12.3644487 Z" id="路径"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

package/lib/components/okrcase-library/index.css

@@ -563,21 +563,19 @@
   background-color: #5c8eff;
 }
 
-.okr-cases-library__payWindow {
-  height: 308px;
+.okr-cases-library__pay-window {
   display: flex;
   flex-direction: column;
   justify-content: start;
   align-items: center;
   background-image: url("./image/支付背景.svg");
   background-repeat: no-repeat;
-  background-position: center;
-  background-size: 100%;
+  background-size: cover;
   position: relative;
-  border-radius: 24px;
+  border-radius: 12px;
 }
 
-.okr-cases-library__payWindow img {
+.okr-cases-library__pay-window__bg-img {
   position: absolute;
   top: -27px;
   left: -55px;
@@ -585,7 +583,7 @@
   height: 129px;
 }
 
-.okr-cases-library__payWindow .tu-icon-canceled {
+.okr-cases-library__pay-window .tu-icon-canceled {
   position: absolute;
   right: 35px;
   top: 28px;
@@ -594,39 +592,39 @@
   cursor: pointer;
 }
 
-.okr-cases-library__payWindow__head {
+.okr-cases-library__pay-window__head {
   margin-top: 46px;
   font-size: 26px;
   font-weight: 600;
   color: #141c28;
 }
 
-.okr-cases-library__payWindow__detail {
+.okr-cases-library__pay-window__detail {
   margin-top: 16px;
   font-size: 16px;
   color: #344755;
 }
 
-.okr-cases-library__payWindow__detail a {
+.okr-cases-library__pay-window__detail a {
   color: #458bff;
 }
 
-.okr-cases-library__payWindow__detail a:hover {
+.okr-cases-library__pay-window__detail a:hover {
   color: #5c8eff;
 }
 
-.okr-cases-library__payWindow__amount {
+.okr-cases-library__pay-window__amount {
   margin-top: 36px;
   color: #141c28;
   font-size: 16px;
 }
 
-.okr-cases-library__payWindow__amount b {
+.okr-cases-library__pay-window__amount b {
   color: #f9541c;
 }
 
-.okr-cases-library__payWindow__payButton {
-  margin-top: 38px;
+.okr-cases-library__pay-window__payButton {
+  margin-bottom: 40px;
   width: 160px;
   height: 36px;
   background: #2879ff;
@@ -638,11 +636,44 @@
   line-height: 36px;
 }
 
-.okr-cases-library__payWindow__payButton:hover {
+.okr-cases-library__pay-window__payButton:hover {
   background-color: #5c8eff;
   color: #fff;
 }
 
+.okr-cases-library__pay-window__type {
+  margin: 24px 0 20px;
+  display: flex;
+}
+
+.okr-cases-library__pay-window__commit-order {
+  background: #FFFFFF;
+  border-radius: 8px;
+  border: 1px solid #DFE3EA;
+  padding: 12px 20px;
+  color: #3F4755;
+  cursor: pointer;
+}
+
+.okr-cases-library__pay-window__commit-order--wx {
+  margin-right: 36px;
+}
+
+.okr-cases-library__pay-window__commit-order--active {
+  border-color: #2879FF;
+  position: relative;
+}
+
+.okr-cases-library__pay-window__commit-order--active:after {
+  content: '';
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 20px;
+  height: 14px;
+  background: url("./image/select-pay-order.svg") no-repeat;
+}
+
 .okrCases-container {
   height: calc(100vh - 42px);
 }

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

@@ -10,6 +10,8 @@ exports.SubmitDialog = SubmitDialog;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _titaUi = require("tita-ui");
 
 var _network = require("../server/network");
@@ -26,12 +28,18 @@ var _payBackgroundImg = _interopRequireDefault(require("../image/payBackgroundIm
 
 var _submitLogo = _interopRequireDefault(require("../image/submitLogo.svg"));
 
+var _wxPay = _interopRequireDefault(require("../image/wx-pay.svg"));
+
+var _aliPay = _interopRequireDefault(require("../image/ali-pay.svg"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -49,22 +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';
 
 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];
@@ -84,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('发送失败');
       });
     }
   };
@@ -121,7 +130,7 @@ function SubmitDialog(props) {
     placeholder: "\u5982\u9500\u552E\u56E2\u961F",
     require: true,
     verifies: [{
-      tip: "OKR类型不能为空",
+      tip: 'OKR类型不能为空',
       test: /\S/
     }],
     onChange: setType
@@ -131,7 +140,7 @@ function SubmitDialog(props) {
     placeholder: "\u5982\u9500\u552EVP",
     require: true,
     verifies: [{
-      tip: "OKR岗位不能为空",
+      tip: 'OKR岗位不能为空',
       test: /\S/
     }],
     onChange: setJob
@@ -146,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) {
@@ -167,27 +176,43 @@ 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)("directPay"),
+  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: '支付宝'
+  }),
+      _useState18 = _slicedToArray(_useState17, 2),
+      wxModel = _useState18[0],
+      setWxModel = _useState18[1];
+
+  var _useState19 = (0, _react.useState)({
+    PayCode: 'wxPay',
+    PayName: '微信'
+  }),
+      _useState20 = _slicedToArray(_useState19, 2),
+      aliModel = _useState20[0],
+      setAliModel = _useState20[1];
+
   (0, _react.useEffect)(function () {
     // 获取OKR产品信息
     (0, _network.getOkrCaseProducts)(packageId).then(function (products) {
@@ -207,12 +232,11 @@ function PayDialog(props) {
         }]
       }).then(function (orderInfo) {
         var Id = orderInfo.Id,
-            AliModel = orderInfo.AliModel;
-        var PayCode = AliModel.PayCode,
-            PayName = AliModel.PayName;
-        setPayCode(PayCode);
+            AliModel = orderInfo.AliModel,
+            WxModel = orderInfo.WxModel;
+        setWxModel(WxModel);
+        setAliModel(AliModel);
         setOrderId(Id);
-        setPayName(PayName);
       });
     });
   }, []); // 点击立即支付后，2分钟内，每个10s，循环获取订单信息
@@ -235,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) {
@@ -268,6 +292,28 @@ function PayDialog(props) {
     }, 10 * 1000); // 10s
   };
 
+  var onPayOrderChange = function onPayOrderChange(orderModel) {
+    var PayCode = orderModel.PayCode,
+        PayName = orderModel.PayName;
+    setPayCode(PayCode);
+    setPayName(PayName);
+  };
+
+  var clickPayNowHandler = function clickPayNowHandler(e) {
+    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');
+      });
+    }
+
+    loopOrderInfo(orderId);
+  };
+
   return /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
     visible: isShowPayWindow,
     noFooter: true,
@@ -278,38 +324,61 @@ function PayDialog(props) {
       return document.body;
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "okr-cases-library__payWindow"
+    className: precls
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: _payBackgroundImg["default"],
-    alt: "\u652F\u4ED8\u80CC\u666F\u6D6E\u51FA"
+    alt: "\u652F\u4ED8\u80CC\u666F\u6D6E\u51FA",
+    className: "".concat(precls, "__bg-img")
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "tu-icon-canceled",
     onClick: function onClick() {
       return handleShowPayWindow(false);
     },
     style: {
-      width: "18px",
-      height: "18px"
+      width: '18px',
+      height: '18px'
     }
   }), /*#__PURE__*/_react["default"].createElement("p", {
-    className: "okr-cases-library__payWindow__head"
-  }, price, " ", "\u8D2D\u4E70\u5343\u4EFD OKR \u6848\u4F8B\u5E93"), /*#__PURE__*/_react["default"].createElement("p", {
-    className: "okr-cases-library__payWindow__detail"
+    className: "".concat(precls, "__head")
+  }, 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", {
-    className: "okr-cases-library__payWindow__amount"
+  }, (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("a", {
-    className: "okr-cases-library__payWindow__payButton",
+  }, "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))),
     onClick: function onClick() {
-      return loopOrderInfo(orderId);
-    },
+      return onPayOrderChange(wxModel);
+    }
+  }, /*#__PURE__*/_react["default"].createElement("img", {
+    src: _wxPay["default"],
+    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))),
+    onClick: function onClick() {
+      return onPayOrderChange(aliModel);
+    }
+  }, /*#__PURE__*/_react["default"].createElement("img", {
+    src: _aliPay["default"],
+    width: 20,
+    style: {
+      marginRight: 4
+    }
+  }), "\u652F\u4ED8\u5B9D\u652F\u4ED8")), /*#__PURE__*/_react["default"].createElement("a", {
+    className: "".concat(precls, "__payButton"),
+    onClick: clickPayNowHandler,
     href: "/app/payorder?orderid=".concat(orderId, "&mobile=13552865071&defcode=").concat(payCode, "&defCodeName=").concat(payName, "&IsContactCustomerService=false"),
     target: "_blank",
     rel: "noreferrer"

package/lib/components/okrcase-library/server/network.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.postSurvey = exports.postSearchCases = exports.postOkrCasesOrder = exports.postLike = exports.postForCases = exports.postApply = exports.gettotalNumber = exports.getOkrOrderInfo = exports.getOkrCaseProducts = exports.getLabels = exports.getIsHadBuyOKRcases = exports.getEssay = void 0;
-
-var _react = require("react");
+exports.postWxPayOrder = exports.postSurvey = exports.postSearchCases = exports.postOkrCasesOrder = exports.postLike = exports.postForCases = exports.postApply = exports.gettotalNumber = exports.getOkrOrderInfo = exports.getOkrCaseProducts = exports.getLabels = exports.getIsHadBuyOKRcases = exports.getEssay = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
@@ -23,19 +21,18 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-var labelUrl = (0, _requestV.getApiUrl)("okrTemplate/getLabel");
-var caseUrl = (0, _requestV.getApiUrl)("okrTemplate/getByLabel");
-var email_usUrl = (0, _requestV.getApiUrl)("okrTemplate/sedEmail");
-var searchUrl = (0, _requestV.getApiUrl)("okrTemplate/search");
-var surveyUrl = (0, _requestV.getApiUrl)("okrTemplate/survey");
-var applyUrl = (0, _requestV.getApiUrl)("okrTemplate/usedTemplate");
-var likeUrl = (0, _requestV.getApiUrl)("okrTemplate/like");
-var articleUrl = (0, _requestV.getApiUrl)("okrTemplate/article");
-var totalNumberUrl = (0, _requestV.getApiUrl)("okrTemplate/allTemplateNum");
-var isHadBuyOKRcasesUrl = (0, _requestV.getApiUrl)("PayService/buyOkrTemplate");
-var PayOrderUrl = (0, _requestV.getApiUrl)("PayService/PayOrder");
-var ProductsUrl = (0, _requestV.getApiUrl)("PayService/products");
-var OkrCasesOrderUrl = (0, _requestV.getApiUrl)("PayService/CommitOrder");
+var labelUrl = (0, _requestV.getApiUrl)('okrTemplate/getLabel');
+var caseUrl = (0, _requestV.getApiUrl)('okrTemplate/getByLabel');
+var searchUrl = (0, _requestV.getApiUrl)('okrTemplate/search');
+var surveyUrl = (0, _requestV.getApiUrl)('okrTemplate/survey');
+var applyUrl = (0, _requestV.getApiUrl)('okrTemplate/usedTemplate');
+var likeUrl = (0, _requestV.getApiUrl)('okrTemplate/like');
+var articleUrl = (0, _requestV.getApiUrl)('okrTemplate/article');
+var totalNumberUrl = (0, _requestV.getApiUrl)('okrTemplate/allTemplateNum');
+var isHadBuyOKRcasesUrl = (0, _requestV.getApiUrl)('PayService/buyOkrTemplate');
+var PayOrderUrl = (0, _requestV.getApiUrl)('PayService/PayOrder');
+var ProductsUrl = (0, _requestV.getApiUrl)('PayService/products');
+var OkrCasesOrderUrl = (0, _requestV.getApiUrl)('PayService/CommitOrder');
 var pageParam = {
   pageSize: 10
 }; // 一次加载的个数
@@ -43,7 +40,7 @@ var pageParam = {
 
 var queryParams = function queryParams() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var queryStr = "?";
+  var queryStr = '?';
 
   for (var key in params) {
     if (params.hasOwnProperty(key)) {
@@ -51,7 +48,7 @@ var queryParams = function queryParams() {
     }
   }
 
-  return queryStr.length == 1 ? "" : queryStr.slice(0, -1);
+  return queryStr.length == 1 ? '' : queryStr.slice(0, -1);
 }; // 搜索
 
 
@@ -65,7 +62,7 @@ var postSearchCases = /*#__PURE__*/function () {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            value = _args.length > 0 && _args[0] !== undefined ? _args[0] : "";
+            value = _args.length > 0 && _args[0] !== undefined ? _args[0] : '';
             pageNum = _args.length > 1 && _args[1] !== undefined ? _args[1] : 1;
             _context.next = 4;
             return _axios["default"].post(searchUrl, _objectSpread(_objectSpread({}, pageParam), {}, {
@@ -377,4 +374,34 @@ var getOkrOrderInfo = /*#__PURE__*/function () {
   };
 }();
 
-exports.getOkrOrderInfo = getOkrOrderInfo;
+exports.getOkrOrderInfo = getOkrOrderInfo;
+
+var postWxPayOrder = /*#__PURE__*/function () {
+  var _ref10 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10(params) {
+    var order_id, default_bank, default_bank_name, res;
+    return regeneratorRuntime.wrap(function _callee10$(_context10) {
+      while (1) {
+        switch (_context10.prev = _context10.next) {
+          case 0:
+            order_id = params.order_id, default_bank = params.default_bank, default_bank_name = params.default_bank_name;
+            _context10.next = 3;
+            return _axios["default"].post((0, _requestV.getApiUrl)("PayService/payorder?order_id=".concat(order_id, "&default_bank=").concat(default_bank, "&default_bank_name=").concat(default_bank_name, "&mobile=13552865071&IsContactCustomerService=false")));
+
+          case 3:
+            res = _context10.sent;
+            return _context10.abrupt("return", res.data.Data);
+
+          case 5:
+          case "end":
+            return _context10.stop();
+        }
+      }
+    }, _callee10);
+  }));
+
+  return function postWxPayOrder(_x3) {
+    return _ref10.apply(this, arguments);
+  };
+}();
+
+exports.postWxPayOrder = postWxPayOrder;

package/lib/pages/aha2021/index.js

@@ -110,7 +110,7 @@ function PageLayout(props) {
     }
   }, children), !isTencentHr && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__help"))
-  }, /*#__PURE__*/_react["default"].createElement(_helpCard["default"], null)), !isTrial && !isTencentHr && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_helpCard["default"], null)), !isTrial && !isTencentHr && !(0, _helpers.isDingDing)() && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     overlay: "\u8054\u7CFB\u5BA2\u670D",
     placement: "left",
     align: {

package/package.json

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