tplus-components-touch 3.39.4 → 3.39.5

package/dist/components/settlement/settlement.js

@@ -522,6 +522,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.settleZero = function () {
       var that = _this2;
+      //预售取货无需支付时省略弹框确认这一步
+      var IdbusiType = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.IdbusiType;
+      if (IdbusiType == 39) {
+        that.handleSettle("zero");
+        return;
+      }
       _modalWraper2.default.confirm({
         className: 'tplus-confirm-modal',
         title: '结算',
@@ -1910,6 +1916,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   message = "退货成功";
                 } else if (MemberPoints && Number(amount) == Number(0)) {
                   message = "兑换成功";
+                } else if (IdbusiType == 39 && received == 0) {
+                  message = "取货成功";
                 }
                 window.__successModal = (0, _utils.showSuccessModal)(amount, received, charge, _this.props.onModalClose, isXianjin, message, resp1 && resp1.data, _mutantsMicrofx.stores, IdbusiType, isFull, function () {
                   _this.handleGuestShow(5);
@@ -3953,7 +3961,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             { key: 'settle', className: (0, _classnames4.default)({ "settle": true, "settle2": type == 1, "settleStorage": true, 'primary-btn': true }), onClick: function onClick() {
                 _this8.btnDebounced();
               }, disabled: productsIsEmpty },
-            this.props.isMemberPoints ? '立即兑换' : this.props.isMemberPointsReturn ? '退货' : settle.name
+            this.props.isMemberPoints ? '立即兑换' : this.props.isMemberPointsReturn ? '退货' : IdbusiType == 39 && _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount == 0 ? '取货' : settle.name
           )
         ),
         !newStyle && _react2.default.createElement(