tplus-components-touch 3.27.39 → 3.27.42

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.
Files changed (193) hide show
  1. package/README.md +16 -16
  2. package/dist/components/acCitySelect/CitySelect.js +18 -18
  3. package/dist/components/acCitySelect/CitySelect.js.map +1 -1
  4. package/dist/components/acCitySelect/CitySelect.less +9 -9
  5. package/dist/components/acCitySelect/citys.js.map +1 -1
  6. package/dist/components/acCitySelect/index.js.map +1 -1
  7. package/dist/components/acCitySelect/provinceData.js +7 -7
  8. package/dist/components/acCitySelect/provinceData.js.map +1 -1
  9. package/dist/components/addLog/AddLogProcessor.js +6 -6
  10. package/dist/components/addLog/AddLogProcessor.js.map +1 -1
  11. package/dist/components/addLog/OperationLogApi.js +3 -3
  12. package/dist/components/addLog/OperationLogApi.js.map +1 -1
  13. package/dist/components/autoComplete/index.js +14 -14
  14. package/dist/components/autoComplete/index.js.map +1 -1
  15. package/dist/components/autoComplete/index.less +89 -89
  16. package/dist/components/autoComplete/option.js.map +1 -1
  17. package/dist/components/autoCompleteWithKeyboard/index.js +14 -14
  18. package/dist/components/autoCompleteWithKeyboard/index.js.map +1 -1
  19. package/dist/components/autoCompleteWithKeyboard/index.less +7 -7
  20. package/dist/components/billSearch/api.js +29 -29
  21. package/dist/components/billSearch/api.js.map +1 -1
  22. package/dist/components/billSearch/index.js +6 -6
  23. package/dist/components/billSearch/index.js.map +1 -1
  24. package/dist/components/billSearch/index.less +376 -376
  25. package/dist/components/cloudPrint/BTPrintFormatUtil.js +17 -17
  26. package/dist/components/cloudPrint/BTPrintFormatUtil.js.map +1 -1
  27. package/dist/components/cloudPrint/api.js.map +1 -1
  28. package/dist/components/cloudPrint/index.js.map +1 -1
  29. package/dist/components/cloudPrint/printDispatch.js +7 -7
  30. package/dist/components/cloudPrint/printDispatch.js.map +1 -1
  31. package/dist/components/commonForm/addressPicker/index.js +7 -7
  32. package/dist/components/commonForm/addressPicker/index.js.map +1 -1
  33. package/dist/components/commonForm/addressPicker/style.less +10 -10
  34. package/dist/components/commonForm/autoComplete/index.js.map +1 -1
  35. package/dist/components/commonForm/autoComplete/style.less +2 -2
  36. package/dist/components/commonForm/datePicker/index.js.map +1 -1
  37. package/dist/components/commonForm/datePicker/style.less +4 -4
  38. package/dist/components/commonForm/formControl/index.js.map +1 -1
  39. package/dist/components/commonForm/index.js +4 -4
  40. package/dist/components/commonForm/index.js.map +1 -1
  41. package/dist/components/commonForm/inputNumber/index.js.map +1 -1
  42. package/dist/components/commonForm/inputNumber/style.less +10 -10
  43. package/dist/components/commonForm/radio/index.js.map +1 -1
  44. package/dist/components/commonForm/style.less +1 -1
  45. package/dist/components/deliverySearch/api.js +21 -21
  46. package/dist/components/deliverySearch/api.js.map +1 -1
  47. package/dist/components/deliverySearch/index.js +6 -6
  48. package/dist/components/deliverySearch/index.js.map +1 -1
  49. package/dist/components/deliverySearch/index.less +553 -553
  50. package/dist/components/form/index.js.map +1 -1
  51. package/dist/components/hardwareAPI/index.js.map +1 -1
  52. package/dist/components/hotKey/config.js +23 -23
  53. package/dist/components/hotKey/config.js.map +1 -1
  54. package/dist/components/hotKey/hotKeyModal.js.map +1 -1
  55. package/dist/components/hotKey/index.js +26 -26
  56. package/dist/components/hotKey/index.js.map +1 -1
  57. package/dist/components/hotKey/localConfig.js.map +1 -1
  58. package/dist/components/hotKey/style.less +96 -96
  59. package/dist/components/hotKey/utils.js.map +1 -1
  60. package/dist/components/input/index.js +6 -6
  61. package/dist/components/input/index.js.map +1 -1
  62. package/dist/components/input/scanInput.js.map +1 -1
  63. package/dist/components/input/scanInput.less +27 -27
  64. package/dist/components/input/style.less +106 -106
  65. package/dist/components/input/tplusInput/index.js +30 -30
  66. package/dist/components/input/tplusInput/index.js.map +1 -1
  67. package/dist/components/input/tplusInput/inputContent.js.map +1 -1
  68. package/dist/components/input/tplusInput/inputs.js.map +1 -1
  69. package/dist/components/input/tplusInput/style.less +132 -132
  70. package/dist/components/input/utils/index.js.map +1 -1
  71. package/dist/components/inventorySearch/api.js +58 -58
  72. package/dist/components/inventorySearch/api.js.map +1 -1
  73. package/dist/components/inventorySearch/index.js +3 -3
  74. package/dist/components/inventorySearch/index.js.map +1 -1
  75. package/dist/components/inventorySearch/index.less +119 -119
  76. package/dist/components/inventorySearch/store.js.map +1 -1
  77. package/dist/components/inventorySearch/tab.js.map +1 -1
  78. package/dist/components/keyboard/index.js.map +1 -1
  79. package/dist/components/keyboard/index.less +469 -469
  80. package/dist/components/keyboard/letterKeyboard.js +2 -2
  81. package/dist/components/keyboard/letterKeyboard.js.map +1 -1
  82. package/dist/components/keyboard/numKeyboard.js +4 -4
  83. package/dist/components/keyboard/numKeyboard.js.map +1 -1
  84. package/dist/components/keyboard/numKeyboardScan.js.map +1 -1
  85. package/dist/components/keyboard/numberButton_input.js +5 -5
  86. package/dist/components/keyboard/numberButton_input.js.map +1 -1
  87. package/dist/components/keyboard/numkeyboardPassword.js +4 -4
  88. package/dist/components/keyboard/numkeyboardPassword.js.map +1 -1
  89. package/dist/components/keyboard/onlyKeyboard.js +7 -7
  90. package/dist/components/keyboard/onlyKeyboard.js.map +1 -1
  91. package/dist/components/keyboard/onlyLetterButton.js +2 -2
  92. package/dist/components/keyboard/onlyLetterButton.js.map +1 -1
  93. package/dist/components/keyboard/onlyLetterButton2.js +2 -2
  94. package/dist/components/keyboard/onlyLetterButton2.js.map +1 -1
  95. package/dist/components/keyboard/onlyLetterButton2.less +156 -156
  96. package/dist/components/keyboard/onlyNumberButton.js +2 -2
  97. package/dist/components/keyboard/onlyNumberButton.js.map +1 -1
  98. package/dist/components/keyboard/onlyNumberButton2.js +3 -3
  99. package/dist/components/keyboard/onlyNumberButton2.js.map +1 -1
  100. package/dist/components/keyboard/textKeyboard.js.map +1 -1
  101. package/dist/components/layout/hamburger.js.map +1 -1
  102. package/dist/components/layout/index.js +10 -10
  103. package/dist/components/layout/index.js.map +1 -1
  104. package/dist/components/layout/layout.js.map +1 -1
  105. package/dist/components/layout/sider.js +12 -12
  106. package/dist/components/layout/sider.js.map +1 -1
  107. package/dist/components/layout/style.less +82 -82
  108. package/dist/components/loading/index.js +15 -15
  109. package/dist/components/loading/index.js.map +1 -1
  110. package/dist/components/loading/loadingContent.js.map +1 -1
  111. package/dist/components/loading/style.less +72 -72
  112. package/dist/components/loading/utils.js.map +1 -1
  113. package/dist/components/message/index.js +8 -8
  114. package/dist/components/message/index.js.map +1 -1
  115. package/dist/components/message/index.less +101 -101
  116. package/dist/components/modal/index.js.map +1 -1
  117. package/dist/components/modal/index.less +19 -19
  118. package/dist/components/modalVertical/index.js +7 -7
  119. package/dist/components/modalVertical/index.js.map +1 -1
  120. package/dist/components/modalVertical/style.less +60 -60
  121. package/dist/components/modalWraper/index.js +15 -15
  122. package/dist/components/modalWraper/index.js.map +1 -1
  123. package/dist/components/modalWraper/style.less +257 -257
  124. package/dist/components/modalWraper/utils.js.map +1 -1
  125. package/dist/components/notification/index.js +4 -4
  126. package/dist/components/notification/index.js.map +1 -1
  127. package/dist/components/notification/index.less +51 -51
  128. package/dist/components/overflowTip/index.js +15 -15
  129. package/dist/components/overflowTip/index.js.map +1 -1
  130. package/dist/components/overflowTip/style.less +66 -66
  131. package/dist/components/page/index.js.map +1 -1
  132. package/dist/components/page/index.less +21 -21
  133. package/dist/components/presale/pickup.js.map +1 -1
  134. package/dist/components/presale/style.less +58 -58
  135. package/dist/components/product/detail.js +7 -7
  136. package/dist/components/product/detail.js.map +1 -1
  137. package/dist/components/product/getCard.js +5 -5
  138. package/dist/components/product/getCard.js.map +1 -1
  139. package/dist/components/product/index.less +128 -128
  140. package/dist/components/progressState/EmptyAndErrorView.js.map +1 -1
  141. package/dist/components/progressState/ProgressState.js +10 -10
  142. package/dist/components/progressState/ProgressState.js.map +1 -1
  143. package/dist/components/progressState/index.js.map +1 -1
  144. package/dist/components/progressState/style.less +65 -65
  145. package/dist/components/scan/index.js.map +1 -1
  146. package/dist/components/scan/index.less +33 -33
  147. package/dist/components/select/index.js.map +1 -1
  148. package/dist/components/select/index.less +11 -11
  149. package/dist/components/settlement/asyncModal.js.map +1 -1
  150. package/dist/components/settlement/index.js +1 -1
  151. package/dist/components/settlement/index.js.map +1 -1
  152. package/dist/components/settlement/moreCzkTable/index.js.map +1 -1
  153. package/dist/components/settlement/moreCzkTable/style.less +6 -6
  154. package/dist/components/settlement/prototypeTable/index.js.map +1 -1
  155. package/dist/components/settlement/prototypeTable/style.less +58 -58
  156. package/dist/components/settlement/prototypeTable/utils.js.map +1 -1
  157. package/dist/components/settlement/settlement.js +38 -26
  158. package/dist/components/settlement/settlement.js.map +1 -1
  159. package/dist/components/settlement/settlement.less +1702 -1702
  160. package/dist/components/settlement/settlementStore.js +100 -73
  161. package/dist/components/settlement/settlementStore.js.map +1 -1
  162. package/dist/components/settlement/utils.js +2 -2
  163. package/dist/components/settlement/utils.js.map +1 -1
  164. package/dist/components/socket/index.js +11 -11
  165. package/dist/components/socket/index.js.map +1 -1
  166. package/dist/components/spin/index.js +6 -6
  167. package/dist/components/spin/index.js.map +1 -1
  168. package/dist/components/spin/spin-style.less +436 -436
  169. package/dist/components/test/index.js +3 -3
  170. package/dist/components/test/index.js.map +1 -1
  171. package/dist/components/ticon/iconfont/demo.css +539 -539
  172. package/dist/components/ticon/iconfont/demo_index.html +5248 -5248
  173. package/dist/components/ticon/iconfont/iconfont.css +895 -895
  174. package/dist/components/ticon/iconfont/iconfont.json +1549 -1549
  175. package/dist/components/ticon/iconfont/iconfont.svg +593 -593
  176. package/dist/components/ticon/index.js.map +1 -1
  177. package/dist/components/touchScroll/index.js +9 -9
  178. package/dist/components/touchScroll/index.js.map +1 -1
  179. package/dist/components/touchTable/AuthProcess.js.map +1 -1
  180. package/dist/components/touchTable/generateWater.js.map +1 -1
  181. package/dist/components/touchTable/index.js +9 -9
  182. package/dist/components/touchTable/index.js.map +1 -1
  183. package/dist/components/touchTable/index.less +376 -376
  184. package/dist/components/touchTable/utils.js.map +1 -1
  185. package/dist/demo/PopOverDemo.js.map +1 -1
  186. package/dist/index.js +7 -7
  187. package/dist/index.js.map +1 -1
  188. package/dist/util/tools.js.map +1 -1
  189. package/locales/zh/tplus-components-touch.json +1 -1
  190. package/locales/zh-CN/tplus-components-touch.json +1 -1
  191. package/mocks/memberInfo.json +79 -79
  192. package/package.json +35 -35
  193. package/tsconfig.json +26 -26
@@ -161,7 +161,7 @@ function _initializerWarningHelper(descriptor, context) {
161
161
  var t = _mutantsMicrofx.i18n.getFixedT(null, 'newretail');
162
162
 
163
163
  var SettlementStore = (_class = function () {
164
- //type==2
164
+ // 预售都是全款;预订是否全款,在点击确认支付时计算订金和商品金额计算得出
165
165
  function SettlementStore() {
166
166
  var _this2 = this;
167
167
 
@@ -174,6 +174,7 @@ var SettlementStore = (_class = function () {
174
174
  this.bquick = false;
175
175
  this.boriginReturn = false;
176
176
  this.newStyle = true;
177
+ this.isFull = true;
177
178
 
178
179
  _initDefineProp(this, 'queryPwd', _descriptor, this);
179
180
 
@@ -499,7 +500,8 @@ var SettlementStore = (_class = function () {
499
500
  var params = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('cloudPrintArguments');
500
501
  if (params) this.cloudPrintArguments = params;
501
502
  this.newStyle = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
502
- }
503
+ } //type==2
504
+
503
505
 
504
506
  (0, _createClass3.default)(SettlementStore, [{
505
507
  key: 'initPaymodes',
@@ -963,9 +965,18 @@ var SettlementStore = (_class = function () {
963
965
  //积分抵现不包含运费
964
966
  var BuyerPayFreight = this.dto.BuyerPayFreight;
965
967
  var DistributionMode = this.dto.DistributionMode;
968
+ var IdbusiType = this.dto.IdbusiType;
969
+
970
+ var _getLoginInfo2 = this.getLoginInfo(),
971
+ PreSellOrBook = _getLoginInfo2.PreSellOrBook,
972
+ PercentageWhenBook = _getLoginInfo2.PercentageWhenBook;
973
+
966
974
  var value = 0;
967
975
  if ((DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0) {
968
976
  value = (0, _utils.getFixedNumber)(Math.Minus(this.paymode.amount, BuyerPayFreight));
977
+ } else if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
978
+ //预订场景下:现场提货,且订金比例非100%时,积分抵现按全款计算(因为只有全款才能使用积分抵现)
979
+ value = this.paymode.bookMaxValue;
969
980
  } else {
970
981
  value = this.paymode.amount;
971
982
  }
@@ -1067,7 +1078,7 @@ var SettlementStore = (_class = function () {
1067
1078
  var BuyerPayFreight = _this9.dto.BuyerPayFreight;
1068
1079
  var DistributionMode = _this9.dto.DistributionMode;
1069
1080
  var value = 0;
1070
- if ((DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 && type != PayStyle.jfdx) {
1081
+ if ((DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 && type == PayStyle.hyczk) {
1071
1082
  value = (0, _utils.getFixedNumber)(parseFloat(_this9.context.viewModel.getViewItem('Voucher').availableAmount) + parseFloat(BuyerPayFreight));
1072
1083
  } else {
1073
1084
  value = _this9.context.viewModel.getViewItem('Voucher').availableAmount;
@@ -1457,7 +1468,7 @@ var SettlementStore = (_class = function () {
1457
1468
  var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
1458
1469
  var _this12 = this;
1459
1470
 
1460
- var _enumController$getEn16, PayStyle, TradeType, IPMSG, RetailTypeEnum, dtoParams, payList, payment, tradeType, ret, _ref15, type, data, msg, code;
1471
+ var _enumController$getEn16, PayStyle, TradeType, IPMSG, RetailTypeEnum, _getLoginInfo3, PreSellOrBook, PercentageWhenBook, _ref15, IdbusiType, DistributionMode, prepaidAmount, fullPayment, dtoParams, payList, payment, tradeType, ret, _ref16, type, data, msg, code;
1461
1472
 
1462
1473
  return _regenerator2.default.wrap(function _callee6$(_context6) {
1463
1474
  while (1) {
@@ -1556,32 +1567,48 @@ var SettlementStore = (_class = function () {
1556
1567
  IPMSG = JSON.parse(window.localStorage.IPMSG);
1557
1568
  }
1558
1569
  RetailTypeEnum = this.dto.IdbusiType == 36 ? "INTEGRAL_EXCHANGE" : "NORMAL";
1570
+ _getLoginInfo3 = this.getLoginInfo(), PreSellOrBook = _getLoginInfo3.PreSellOrBook, PercentageWhenBook = _getLoginInfo3.PercentageWhenBook;
1571
+ _ref15 = this.dto || {}, IdbusiType = _ref15.IdbusiType, DistributionMode = _ref15.DistributionMode;
1572
+
1573
+ if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
1574
+ prepaidAmount = (0, _utils.getFixedNumber)(this.dto.RetailPaymentDetails.reduce(function (c, item) {
1575
+ return c + (item.Amount || 0);
1576
+ }, 0));
1577
+ fullPayment = (0, _utils.getFixedNumber)(this.dto.RetailDetails.reduce(function (c, item) {
1578
+ return c + (item.TaxAmount || 0);
1579
+ }, 0));
1580
+
1581
+ this.isFull = fullPayment == prepaidAmount; // 是否全款
1582
+ (0, _mobx.runInAction)(function () {
1583
+ _this12.dto.PrepaidAmount = prepaidAmount;
1584
+ });
1585
+ }
1559
1586
  _context6.t1 = this.dto.IdbusiType == 37;
1560
1587
 
1561
1588
  if (!_context6.t1) {
1562
- _context6.next = 11;
1589
+ _context6.next = 14;
1563
1590
  break;
1564
1591
  }
1565
1592
 
1566
- _context6.next = 10;
1593
+ _context6.next = 13;
1567
1594
  return this.checkIntegralExchangeReturn(this.dto.RetailDetails[0].ReturnSourceId);
1568
1595
 
1569
- case 10:
1596
+ case 13:
1570
1597
  _context6.t1 = _context6.sent;
1571
1598
 
1572
- case 11:
1599
+ case 14:
1573
1600
  _context6.t0 = _context6.t1;
1574
1601
 
1575
1602
  if (_context6.t0) {
1576
- _context6.next = 14;
1603
+ _context6.next = 17;
1577
1604
  break;
1578
1605
  }
1579
1606
 
1580
1607
  _context6.t0 = this.dto.IdbusiType != 37;
1581
1608
 
1582
- case 14:
1609
+ case 17:
1583
1610
  if (!_context6.t0) {
1584
- _context6.next = 33;
1611
+ _context6.next = 36;
1585
1612
  break;
1586
1613
  }
1587
1614
 
@@ -1593,45 +1620,45 @@ var SettlementStore = (_class = function () {
1593
1620
  });
1594
1621
 
1595
1622
  if (!(payList && payList.length > 0)) {
1596
- _context6.next = 30;
1623
+ _context6.next = 33;
1597
1624
  break;
1598
1625
  }
1599
1626
 
1600
1627
  payment = payList[0];
1601
1628
  tradeType = payment && payment.Amount > 0 ? TradeType.PAY : TradeType.REFUND;
1602
- _context6.next = 22;
1629
+ _context6.next = 25;
1603
1630
  return this.thirdPay(1, payment, tradeType, dtoParams);
1604
1631
 
1605
- case 22:
1632
+ case 25:
1606
1633
  ret = _context6.sent;
1607
- _ref15 = ret || {}, type = _ref15.type, data = _ref15.data, msg = _ref15.msg, code = _ref15.code;
1634
+ _ref16 = ret || {}, type = _ref16.type, data = _ref16.data, msg = _ref16.msg, code = _ref16.code;
1608
1635
 
1609
1636
  if (!(type === true)) {
1610
- _context6.next = 28;
1637
+ _context6.next = 31;
1611
1638
  break;
1612
1639
  }
1613
1640
 
1614
1641
  dtoParams = data;
1615
- _context6.next = 30;
1642
+ _context6.next = 33;
1616
1643
  break;
1617
1644
 
1618
- case 28:
1645
+ case 31:
1619
1646
  _message2.default.warn('\u5237\u5361\u652F\u4ED8\u5931\u8D25,\u9519\u8BEF\u7801:' + code);
1620
1647
  return _context6.abrupt('return', false);
1621
1648
 
1622
- case 30:
1649
+ case 33:
1623
1650
  this.dtoParams = dtoParams;
1624
1651
  console.log('结算信息:', dtoParams);
1625
1652
  return _context6.abrupt('return', (0, _tplusApi.ccApi)({ dto: dtoParams, cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
1626
- var _ref16 = resp || {},
1627
- ID = _ref16.ID;
1653
+ var _ref17 = resp || {},
1654
+ ID = _ref17.ID;
1628
1655
 
1629
1656
  _this12.setDtoID(ID);
1630
1657
  _this12.billID = ID;
1631
1658
  _this12.paymode.checkList = [];
1632
1659
  }));
1633
1660
 
1634
- case 33:
1661
+ case 36:
1635
1662
  case 'end':
1636
1663
  return _context6.stop();
1637
1664
  }
@@ -1657,19 +1684,19 @@ var SettlementStore = (_class = function () {
1657
1684
  return data;
1658
1685
  }
1659
1686
 
1660
- /**
1661
- * 二开支付
1662
- * vType:1零售单、2储值单
1663
- * payment:结算方式
1664
- * trade:00表示结算、02表示退款
1665
- * dto:结算数据集合
1687
+ /**
1688
+ * 二开支付
1689
+ * vType:1零售单、2储值单
1690
+ * payment:结算方式
1691
+ * trade:00表示结算、02表示退款
1692
+ * dto:结算数据集合
1666
1693
  */
1667
1694
 
1668
1695
  }, {
1669
1696
  key: 'thirdPay',
1670
1697
  value: function () {
1671
- var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(vType, payment, trade, dto) {
1672
- var cto, params, ret, _ref18, Code, _Message, Result, _ref19, ThirdPaymentReturnInfo;
1698
+ var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(vType, payment, trade, dto) {
1699
+ var cto, params, ret, _ref19, Code, _Message, Result, _ref20, ThirdPaymentReturnInfo;
1673
1700
 
1674
1701
  return _regenerator2.default.wrap(function _callee7$(_context7) {
1675
1702
  while (1) {
@@ -1692,7 +1719,7 @@ var SettlementStore = (_class = function () {
1692
1719
 
1693
1720
  console.log('刷卡返回信息:', ret);
1694
1721
  ret = JSON.parse(ret);
1695
- _ref18 = ret || {}, Code = _ref18.Code, _Message = _ref18.Message, Result = _ref18.Result;
1722
+ _ref19 = ret || {}, Code = _ref19.Code, _Message = _ref19.Message, Result = _ref19.Result;
1696
1723
 
1697
1724
  if (!(Code > 0)) {
1698
1725
  _context7.next = 14;
@@ -1707,7 +1734,7 @@ var SettlementStore = (_class = function () {
1707
1734
  break;
1708
1735
  }
1709
1736
 
1710
- _ref19 = Result || {}, ThirdPaymentReturnInfo = _ref19.ThirdPaymentReturnInfo;
1737
+ _ref20 = Result || {}, ThirdPaymentReturnInfo = _ref20.ThirdPaymentReturnInfo;
1711
1738
 
1712
1739
  if (vType == 1) {
1713
1740
  dto.RetailPaymentDetails.forEach(function (v) {
@@ -1750,7 +1777,7 @@ var SettlementStore = (_class = function () {
1750
1777
  }));
1751
1778
 
1752
1779
  function thirdPay(_x4, _x5, _x6, _x7) {
1753
- return _ref17.apply(this, arguments);
1780
+ return _ref18.apply(this, arguments);
1754
1781
  }
1755
1782
 
1756
1783
  return thirdPay;
@@ -1761,7 +1788,7 @@ var SettlementStore = (_class = function () {
1761
1788
  }, {
1762
1789
  key: 'thirdPayRefund',
1763
1790
  value: function () {
1764
- var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(type) {
1791
+ var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(type) {
1765
1792
  var _this13 = this;
1766
1793
 
1767
1794
  var dto, pay, payment, _enumController$getEn17, TradeType;
@@ -1783,7 +1810,7 @@ var SettlementStore = (_class = function () {
1783
1810
  _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(), TradeType = _enumController$getEn17.TradeType;
1784
1811
 
1785
1812
  setTimeout((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
1786
- var ret, _ref22, msg;
1813
+ var ret, _ref23, msg;
1787
1814
 
1788
1815
  return _regenerator2.default.wrap(function _callee8$(_context8) {
1789
1816
  while (1) {
@@ -1794,7 +1821,7 @@ var SettlementStore = (_class = function () {
1794
1821
 
1795
1822
  case 2:
1796
1823
  ret = _context8.sent;
1797
- _ref22 = ret || {}, msg = _ref22.msg;
1824
+ _ref23 = ret || {}, msg = _ref23.msg;
1798
1825
 
1799
1826
  console.log('\u5237\u5361\u652F\u4ED8\u9000\u6B3E:' + msg);
1800
1827
 
@@ -1816,7 +1843,7 @@ var SettlementStore = (_class = function () {
1816
1843
  }));
1817
1844
 
1818
1845
  function thirdPayRefund(_x8) {
1819
- return _ref20.apply(this, arguments);
1846
+ return _ref21.apply(this, arguments);
1820
1847
  }
1821
1848
 
1822
1849
  return thirdPayRefund;
@@ -1829,7 +1856,7 @@ var SettlementStore = (_class = function () {
1829
1856
  }, {
1830
1857
  key: 'querySettleResult',
1831
1858
  value: function () {
1832
- var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10() {
1859
+ var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10() {
1833
1860
  return _regenerator2.default.wrap(function _callee10$(_context10) {
1834
1861
  while (1) {
1835
1862
  switch (_context10.prev = _context10.next) {
@@ -1857,7 +1884,7 @@ var SettlementStore = (_class = function () {
1857
1884
  }));
1858
1885
 
1859
1886
  function querySettleResult() {
1860
- return _ref23.apply(this, arguments);
1887
+ return _ref24.apply(this, arguments);
1861
1888
  }
1862
1889
 
1863
1890
  return querySettleResult;
@@ -1883,14 +1910,14 @@ var SettlementStore = (_class = function () {
1883
1910
  }, {
1884
1911
  key: 'validePwd',
1885
1912
  value: function () {
1886
- var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(value) {
1887
- var _ref25, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, result, count, _result;
1913
+ var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(value) {
1914
+ var _ref26, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, result, count, _result;
1888
1915
 
1889
1916
  return _regenerator2.default.wrap(function _callee11$(_context11) {
1890
1917
  while (1) {
1891
1918
  switch (_context11.prev = _context11.next) {
1892
1919
  case 0:
1893
- _ref25 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref25.isNewRetailBCPos;
1920
+ _ref26 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref26.isNewRetailBCPos;
1894
1921
  _context11.prev = 1;
1895
1922
 
1896
1923
  if (!isNewRetailBCPos) {
@@ -2007,7 +2034,7 @@ var SettlementStore = (_class = function () {
2007
2034
  }));
2008
2035
 
2009
2036
  function validePwd(_x9) {
2010
- return _ref24.apply(this, arguments);
2037
+ return _ref25.apply(this, arguments);
2011
2038
  }
2012
2039
 
2013
2040
  return validePwd;
@@ -2046,14 +2073,14 @@ var SettlementStore = (_class = function () {
2046
2073
  var _this15 = this;
2047
2074
 
2048
2075
  return function () {
2049
- var _ref26 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(_this) {
2050
- var _getLoginInfo2, IdStore, StoreCode, resp;
2076
+ var _ref27 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(_this) {
2077
+ var _getLoginInfo4, IdStore, StoreCode, resp;
2051
2078
 
2052
2079
  return _regenerator2.default.wrap(function _callee12$(_context12) {
2053
2080
  while (1) {
2054
2081
  switch (_context12.prev = _context12.next) {
2055
2082
  case 0:
2056
- _getLoginInfo2 = _this15.getLoginInfo(), IdStore = _getLoginInfo2.IdStore, StoreCode = _getLoginInfo2.StoreCode;
2083
+ _getLoginInfo4 = _this15.getLoginInfo(), IdStore = _getLoginInfo4.IdStore, StoreCode = _getLoginInfo4.StoreCode;
2057
2084
  _context12.next = 3;
2058
2085
  return (0, _tplusApi.tApi)({ Idmember: _this15.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
2059
2086
 
@@ -2073,7 +2100,7 @@ var SettlementStore = (_class = function () {
2073
2100
  }));
2074
2101
 
2075
2102
  return function (_x10) {
2076
- return _ref26.apply(this, arguments);
2103
+ return _ref27.apply(this, arguments);
2077
2104
  };
2078
2105
  }();
2079
2106
  }
@@ -2083,7 +2110,7 @@ var SettlementStore = (_class = function () {
2083
2110
  var _this16 = this;
2084
2111
 
2085
2112
  return function () {
2086
- var _ref27 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(memberId) {
2113
+ var _ref28 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(memberId) {
2087
2114
  var result;
2088
2115
  return _regenerator2.default.wrap(function _callee13$(_context13) {
2089
2116
  while (1) {
@@ -2138,7 +2165,7 @@ var SettlementStore = (_class = function () {
2138
2165
  }));
2139
2166
 
2140
2167
  return function (_x11) {
2141
- return _ref27.apply(this, arguments);
2168
+ return _ref28.apply(this, arguments);
2142
2169
  };
2143
2170
  }();
2144
2171
  }
@@ -2173,7 +2200,7 @@ var SettlementStore = (_class = function () {
2173
2200
  }), _applyDecoratedDescriptor(_class.prototype, 'addDjq', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addDjq'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeClickFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeClickFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeValue'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPayDirectly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPayDirectly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'delPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'delPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'setDtoID', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'setDtoID'), _class.prototype)), _class);
2174
2201
  exports.default = SettlementStore;
2175
2202
  var PayMode = exports.PayMode = (_class3 = function () {
2176
- //预订非全款 or 取货最大补款数大于0时 为 true
2203
+ //预订场景下,现场提货,且选项设置订金比例非100% or 取货最大补款数大于0时 为 true
2177
2204
  function PayMode() {
2178
2205
  // this.amount=getFixedNumber(amount);
2179
2206
  // this.calcReserved();
@@ -2216,7 +2243,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
2216
2243
  _initDefineProp(this, 'addDjqs', _descriptor14, this);
2217
2244
  }
2218
2245
  // @observable store = null;
2219
- //只是预订非全款时为true
2246
+ //只是预订场景下,现场提货,且选项设置订金比例非100%时 为 true
2220
2247
  //应收
2221
2248
 
2222
2249
 
@@ -2300,8 +2327,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
2300
2327
  this.checkList = [];
2301
2328
  }
2302
2329
 
2303
- var _ref29 = _mutantsUtil.platform || {},
2304
- isNewRetailBCPos = _ref29.isNewRetailBCPos;
2330
+ var _ref30 = _mutantsUtil.platform || {},
2331
+ isNewRetailBCPos = _ref30.isNewRetailBCPos;
2305
2332
 
2306
2333
  var _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(),
2307
2334
  PayStyle = _enumController$getEn18.PayStyle,
@@ -2411,18 +2438,18 @@ var PayMode = exports.PayMode = (_class3 = function () {
2411
2438
  }
2412
2439
  });
2413
2440
 
2414
- var _ref30 = element || {},
2415
- couponCode = _ref30.couponCode,
2416
- name = _ref30.name,
2417
- tieredAmountResult = _ref30.tieredAmountResult,
2418
- fromDate = _ref30.fromDate,
2419
- dateMount = _ref30.dateMount,
2420
- promoMethodEnum = _ref30.promoMethodEnum,
2421
- discountPct = _ref30.discountPct,
2422
- nominalAmount = _ref30.nominalAmount,
2423
- promoId = _ref30.promoId,
2424
- id = _ref30.id,
2425
- doorsill = _ref30.doorsill;
2441
+ var _ref31 = element || {},
2442
+ couponCode = _ref31.couponCode,
2443
+ name = _ref31.name,
2444
+ tieredAmountResult = _ref31.tieredAmountResult,
2445
+ fromDate = _ref31.fromDate,
2446
+ dateMount = _ref31.dateMount,
2447
+ promoMethodEnum = _ref31.promoMethodEnum,
2448
+ discountPct = _ref31.discountPct,
2449
+ nominalAmount = _ref31.nominalAmount,
2450
+ promoId = _ref31.promoId,
2451
+ id = _ref31.id,
2452
+ doorsill = _ref31.doorsill;
2426
2453
 
2427
2454
  var condValue = tieredAmountResult.condValue,
2428
2455
  promoDiscount = tieredAmountResult.promoDiscount,
@@ -2466,8 +2493,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
2466
2493
  }, {
2467
2494
  key: 'calcDjqValue',
2468
2495
  value: function calcDjqValue(q1) {
2469
- var _ref31 = _mutantsUtil.platform || {},
2470
- isNewRetailBCPos = _ref31.isNewRetailBCPos;
2496
+ var _ref32 = _mutantsUtil.platform || {},
2497
+ isNewRetailBCPos = _ref32.isNewRetailBCPos;
2471
2498
 
2472
2499
  var _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(),
2473
2500
  Differentiate = _enumController$getEn19.Differentiate;
@@ -2557,17 +2584,17 @@ var PayMode = exports.PayMode = (_class3 = function () {
2557
2584
  }, {
2558
2585
  key: 'setPaymodes',
2559
2586
  value: function () {
2560
- var _ref32 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(type, isIntegralExchange) {
2587
+ var _ref33 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(type, isIntegralExchange) {
2561
2588
  var _this19 = this;
2562
2589
 
2563
- var _ref33, isHorizontalPad, isHorizontalSunMi, isMobileEnvironment, _enumController$getEn21, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
2590
+ var _ref34, isHorizontalPad, isHorizontalSunMi, isMobileEnvironment, _enumController$getEn21, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
2564
2591
 
2565
2592
  return _regenerator2.default.wrap(function _callee15$(_context15) {
2566
2593
  while (1) {
2567
2594
  switch (_context15.prev = _context15.next) {
2568
2595
  case 0:
2569
2596
  // 是否移动端判断
2570
- _ref33 = _mutantsUtil.platform || {}, isHorizontalPad = _ref33.isHorizontalPad, isHorizontalSunMi = _ref33.isHorizontalSunMi;
2597
+ _ref34 = _mutantsUtil.platform || {}, isHorizontalPad = _ref34.isHorizontalPad, isHorizontalSunMi = _ref34.isHorizontalSunMi;
2571
2598
  isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
2572
2599
  _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn21.settleStyleType, PayStyle = _enumController$getEn21.PayStyle;
2573
2600
  memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
@@ -2619,7 +2646,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
2619
2646
  }));
2620
2647
 
2621
2648
  function setPaymodes(_x12, _x13) {
2622
- return _ref32.apply(this, arguments);
2649
+ return _ref33.apply(this, arguments);
2623
2650
  }
2624
2651
 
2625
2652
  return setPaymodes;
@@ -2752,8 +2779,8 @@ var Member = exports.Member = (_class5 = function () {
2752
2779
  return key == 'canusedbalancestorage';
2753
2780
  });
2754
2781
 
2755
- var _ref34 = _mutantsUtil.platform || {},
2756
- isNewRetailBCPos = _ref34.isNewRetailBCPos;
2782
+ var _ref35 = _mutantsUtil.platform || {},
2783
+ isNewRetailBCPos = _ref35.isNewRetailBCPos;
2757
2784
 
2758
2785
  (0, _mobx.runInAction)(function () {
2759
2786
  _this23.cardNo = m.CardCode;