tplus-components-touch 3.26.12 → 3.26.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -709,7 +709,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
709
709
  // 判断是否有密码
710
710
  _this2$store$paymode$ = _this2.store.paymode.currentMode, walletEnabled = _this2$store$paymode$.walletEnabled, cardTypeEnum = _this2$store$paymode$.cardTypeEnum;
711
711
 
712
- if (cardTypeEnum === 'BALANCE_CARD' && !walletEnabled && !_this2.store.dto.FreePaymentPasswordStore) {
712
+ if (cardTypeEnum === 'BALANCE_CARD' && _this2.store.dto.FreePaymentPasswordStore) {
713
+ _this2.handleCzkData();
714
+ } else if (cardTypeEnum === 'BALANCE_CARD' && !walletEnabled) {
713
715
  _this2.setState({
714
716
  showSetPwdModal: true,
715
717
  btnDissabled: true
@@ -1039,9 +1041,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1039
1041
  paymode.currentMode = null;
1040
1042
  switch (key) {
1041
1043
  case PayStyle.hyczk:
1042
- _this2.showCzkModal(-1);
1043
- _this2.store.dto.Idmember && _this2.setState({
1044
+ _this2.setState({
1044
1045
  isInputMember: true
1046
+ }, function () {
1047
+ _this2.showCzkModal(-1);
1045
1048
  });
1046
1049
  break;
1047
1050
  case PayStyle.jfdx:
@@ -2288,8 +2291,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2288
2291
  _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
2289
2292
 
2290
2293
  if (curmode.paymentType === PayStyle.hyczk) {
2291
- if (curmode.cardTypeEnum === 'BALANCE_CARD' && !_this2.store.dto.FreePaymentPasswordStore || curmode.isNeedPassword) {
2292
- promises.push(that.inputPwd(curmode));
2294
+ if (curmode.cardTypeEnum === 'BALANCE_CARD') {
2295
+ !_this2.store.dto.FreePaymentPasswordStore && promises.push(that.inputPwd(curmode));
2296
+ } else {
2297
+ if (_this2.store.dto.Idmember === curmode.memberId) {
2298
+ !_this2.store.dto.FreePaymentPasswordStore && promises.push(that.inputPwd(curmode));
2299
+ } else {
2300
+ curmode.isNeedPassword && promises.push(that.inputPwd(curmode));
2301
+ }
2293
2302
  }
2294
2303
  }
2295
2304
  }