tplus-components-touch 3.33.7 → 3.33.11

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 (188) 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 +99 -99
  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/product/detail.js +7 -7
  134. package/dist/components/product/detail.js.map +1 -1
  135. package/dist/components/product/getCard.js +5 -5
  136. package/dist/components/product/getCard.js.map +1 -1
  137. package/dist/components/product/index.less +128 -128
  138. package/dist/components/progressState/EmptyAndErrorView.js.map +1 -1
  139. package/dist/components/progressState/ProgressState.js +10 -10
  140. package/dist/components/progressState/ProgressState.js.map +1 -1
  141. package/dist/components/progressState/index.js.map +1 -1
  142. package/dist/components/progressState/style.less +65 -65
  143. package/dist/components/scan/index.js.map +1 -1
  144. package/dist/components/scan/index.less +33 -33
  145. package/dist/components/select/index.js.map +1 -1
  146. package/dist/components/select/index.less +11 -11
  147. package/dist/components/settlement/asyncModal.js.map +1 -1
  148. package/dist/components/settlement/index.js.map +1 -1
  149. package/dist/components/settlement/moreCzkTable/index.js.map +1 -1
  150. package/dist/components/settlement/moreCzkTable/style.less +6 -6
  151. package/dist/components/settlement/prototypeTable/index.js.map +1 -1
  152. package/dist/components/settlement/prototypeTable/style.less +58 -58
  153. package/dist/components/settlement/prototypeTable/utils.js.map +1 -1
  154. package/dist/components/settlement/settlement.js +268 -313
  155. package/dist/components/settlement/settlement.js.map +1 -1
  156. package/dist/components/settlement/settlement.less +1686 -1686
  157. package/dist/components/settlement/settlementStore.js +58 -66
  158. package/dist/components/settlement/settlementStore.js.map +1 -1
  159. package/dist/components/settlement/utils.js.map +1 -1
  160. package/dist/components/socket/index.js +11 -11
  161. package/dist/components/socket/index.js.map +1 -1
  162. package/dist/components/spin/index.js +6 -6
  163. package/dist/components/spin/index.js.map +1 -1
  164. package/dist/components/spin/spin-style.less +436 -436
  165. package/dist/components/test/index.js +3 -3
  166. package/dist/components/test/index.js.map +1 -1
  167. package/dist/components/ticon/iconfont/demo_index.html +5248 -5248
  168. package/dist/components/ticon/iconfont/iconfont.css +895 -895
  169. package/dist/components/ticon/iconfont/iconfont.json +1549 -1549
  170. package/dist/components/ticon/iconfont/iconfont.svg +593 -593
  171. package/dist/components/ticon/index.js.map +1 -1
  172. package/dist/components/touchScroll/index.js +9 -9
  173. package/dist/components/touchScroll/index.js.map +1 -1
  174. package/dist/components/touchTable/AuthProcess.js.map +1 -1
  175. package/dist/components/touchTable/generateWater.js.map +1 -1
  176. package/dist/components/touchTable/index.js +9 -9
  177. package/dist/components/touchTable/index.js.map +1 -1
  178. package/dist/components/touchTable/index.less +376 -376
  179. package/dist/components/touchTable/utils.js.map +1 -1
  180. package/dist/demo/PopOverDemo.js.map +1 -1
  181. package/dist/index.js +7 -7
  182. package/dist/index.js.map +1 -1
  183. package/dist/util/tools.js.map +1 -1
  184. package/locales/zh/tplus-components-touch.json +1 -1
  185. package/locales/zh-CN/tplus-components-touch.json +1 -1
  186. package/mocks/memberInfo.json +79 -79
  187. package/package.json +35 -35
  188. package/tsconfig.json +26 -26
@@ -41,7 +41,7 @@ var _createClass2 = require('babel-runtime/helpers/createClass');
41
41
 
42
42
  var _createClass3 = _interopRequireDefault(_createClass2);
43
43
 
44
- var _desc, _value, _class, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _desc2, _value2, _class3, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _desc3, _value3, _class5, _descriptor16, _descriptor17, _descriptor18, _descriptor19, _descriptor20;
44
+ var _desc, _value, _class, _descriptor, _descriptor2, _descriptor3, _descriptor4, _desc2, _value2, _class3, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _desc3, _value3, _class5, _descriptor15, _descriptor16, _descriptor17, _descriptor18, _descriptor19;
45
45
 
46
46
  var _mobx = require('mobx');
47
47
 
@@ -326,7 +326,7 @@ var SettlementStore = (_class = function () {
326
326
  var _ref2 = _mutantsUtil.platform || {},
327
327
  isNewRetailBCPos = _ref2.isNewRetailBCPos;
328
328
 
329
- _this2.addDjq(couponCode, name, IsEnable, promoMethodEnum == "CASH_COUPON" ? nominalAmount : promoDiscount, condValue, null, false, !result.IsRepelWithPoints, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, true, 1);
329
+ _this2.addDjq(couponCode, name, IsEnable, promoMethodEnum == "CASH_COUPON" && nominalAmount, promoDiscount, condValue, null, false, !result.IsRepelWithPoints, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, true, 1);
330
330
  }
331
331
  });
332
332
  if (promoVoucher.coupon_code) {
@@ -467,8 +467,6 @@ var SettlementStore = (_class = function () {
467
467
  });
468
468
  };
469
469
 
470
- _initDefineProp(this, 'setVoucherDate', _descriptor5, this);
471
-
472
470
  this.checkIntegralExchangeReturn = function (id) {
473
471
  return new _promise2.default(function (resolve, reject) {
474
472
  (0, _tplusApi.tApi)({ param: { refVoucherId: id } }, 'chanjet.RE.NewPos.GetNewIntegralExchange', false, false, { timeout_skip: true }).then(function (resp) {
@@ -620,10 +618,10 @@ var SettlementStore = (_class = function () {
620
618
  promoId = _ref7.promoId,
621
619
  id = _ref7.id;
622
620
 
623
- _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false, _this5.dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, null, id, true);
621
+ _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, null, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false, _this5.dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, null, id, true);
624
622
  return;
625
623
  }
626
- _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false);
624
+ _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, null, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false);
627
625
  });
628
626
  }
629
627
  _this5.paymode.thePaymodes.push(newmode);
@@ -856,12 +854,13 @@ var SettlementStore = (_class = function () {
856
854
  }
857
855
  }, {
858
856
  key: 'addDjq',
859
- value: function addDjq(promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, unCheck, count) {
857
+ value: function addDjq(promoCouponCode, name, IsEnable, nominalAmount, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, unCheck, count) {
860
858
  var djq = {
861
859
  code: promoCouponCode,
862
860
  promoCouponCode: promoCouponCode,
863
861
  name: name,
864
862
  IsEnable: IsEnable,
863
+ nominalAmount: nominalAmount,
865
864
  amount: amount,
866
865
  doorsill: doorsill, //:"无门槛"
867
866
  LastTS: LastTS,
@@ -2009,16 +2008,7 @@ var SettlementStore = (_class = function () {
2009
2008
  }, _callee13, _this17);
2010
2009
  }));
2011
2010
  }
2012
- }), _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), _descriptor5 = _applyDecoratedDescriptor(_class.prototype, 'setVoucherDate', [_mobx.action], {
2013
- enumerable: true,
2014
- initializer: function initializer() {
2015
- var _this18 = this;
2016
-
2017
- return function () {
2018
- _this18.dto.VoucherDate = new Date();
2019
- };
2020
- }
2021
- }), _applyDecoratedDescriptor(_class.prototype, 'setDtoID', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'setDtoID'), _class.prototype)), _class);
2011
+ }), _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);
2022
2012
  exports.default = SettlementStore;
2023
2013
  var PayMode = exports.PayMode = (_class3 = function () {
2024
2014
  //应收
@@ -2032,19 +2022,19 @@ var PayMode = exports.PayMode = (_class3 = function () {
2032
2022
  this.onlineamount = 0;
2033
2023
  this.maxamount = 0;
2034
2024
 
2035
- _initDefineProp(this, 'currentFocus', _descriptor6, this);
2025
+ _initDefineProp(this, 'currentFocus', _descriptor5, this);
2036
2026
 
2037
- _initDefineProp(this, 'received', _descriptor7, this);
2027
+ _initDefineProp(this, 'received', _descriptor6, this);
2038
2028
 
2039
- _initDefineProp(this, 'receivable', _descriptor8, this);
2029
+ _initDefineProp(this, 'receivable', _descriptor7, this);
2040
2030
 
2041
- _initDefineProp(this, 'paymodes', _descriptor9, this);
2031
+ _initDefineProp(this, 'paymodes', _descriptor8, this);
2042
2032
 
2043
- _initDefineProp(this, 'thePaymodes', _descriptor10, this);
2033
+ _initDefineProp(this, 'thePaymodes', _descriptor9, this);
2044
2034
 
2045
- _initDefineProp(this, 'storageCardNo', _descriptor11, this);
2035
+ _initDefineProp(this, 'storageCardNo', _descriptor10, this);
2046
2036
 
2047
- _initDefineProp(this, 'balance', _descriptor12, this);
2037
+ _initDefineProp(this, 'balance', _descriptor11, this);
2048
2038
 
2049
2039
  this.currentMode = null;
2050
2040
  this.checkList = [];
@@ -2053,11 +2043,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
2053
2043
  hotKey: "Ctrl+M"
2054
2044
  };
2055
2045
 
2056
- _initDefineProp(this, 'calcCheckList', _descriptor13, this);
2046
+ _initDefineProp(this, 'calcCheckList', _descriptor12, this);
2057
2047
 
2058
- _initDefineProp(this, 'setCouponNum', _descriptor14, this);
2048
+ _initDefineProp(this, 'setCouponNum', _descriptor13, this);
2059
2049
 
2060
- _initDefineProp(this, 'addDjqs', _descriptor15, this);
2050
+ _initDefineProp(this, 'addDjqs', _descriptor14, this);
2061
2051
  }
2062
2052
  // @observable store = null;
2063
2053
 
@@ -2116,7 +2106,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
2116
2106
  }, {
2117
2107
  key: 'calcDjqCheckValue',
2118
2108
  value: function calcDjqCheckValue(q1, dto, params) {
2119
- var _this19 = this;
2109
+ var _this18 = this;
2120
2110
 
2121
2111
  var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
2122
2112
  var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
@@ -2163,7 +2153,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
2163
2153
  if (!q1.checked) {
2164
2154
  this.checkList.forEach(function (ele, i) {
2165
2155
  if (ele.id === q1.id) {
2166
- _this19.checkList.splice(i, 1);
2156
+ _this18.checkList.splice(i, 1);
2167
2157
  }
2168
2158
  });
2169
2159
  } else {
@@ -2235,7 +2225,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
2235
2225
  if (result && result.length != 0) {
2236
2226
  result.forEach(function (element, index) {
2237
2227
  var djq1 = false;
2238
- _this19.currentMode.djqs.forEach(function (djq) {
2228
+ _this18.currentMode.djqs.forEach(function (djq) {
2239
2229
  if (element.id === djq.id) {
2240
2230
  djq1 = true;
2241
2231
  }
@@ -2280,10 +2270,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
2280
2270
  // couponCategoryEnum: tieredAmountResult.couponCategoryEnum,
2281
2271
  // id
2282
2272
  // })
2283
- _this19.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
2273
+ _this18.addDjqs(couponCode, name, true, nominalAmount, promoDiscount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
2284
2274
  djq1 = false;
2285
2275
  } else {
2286
- _this19.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
2276
+ _this18.setCouponNum(element.id, couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
2287
2277
  // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
2288
2278
  // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
2289
2279
  }
@@ -2388,7 +2378,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
2388
2378
  key: 'setPaymodes',
2389
2379
  value: function () {
2390
2380
  var _ref30 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(type, isIntegralExchange) {
2391
- var _this20 = this;
2381
+ var _this19 = this;
2392
2382
 
2393
2383
  var _enumController$getEn21, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
2394
2384
 
@@ -2428,7 +2418,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
2428
2418
  thridPayment: mode.ThirdPaymentInfo
2429
2419
  });
2430
2420
  });
2431
- _this20.paymodes = paymodes;
2421
+ _this19.paymodes = paymodes;
2432
2422
  });
2433
2423
  }
2434
2424
 
@@ -2458,59 +2448,60 @@ var PayMode = exports.PayMode = (_class3 = function () {
2458
2448
  }
2459
2449
  }]);
2460
2450
  return PayMode;
2461
- }(), (_descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
2451
+ }(), (_descriptor5 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
2462
2452
  enumerable: true,
2463
2453
  initializer: function initializer() {
2464
2454
  return "";
2465
2455
  }
2466
- }), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
2456
+ }), _descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
2467
2457
  enumerable: true,
2468
2458
  initializer: function initializer() {
2469
2459
  return 0;
2470
2460
  }
2471
- }), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
2461
+ }), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
2472
2462
  enumerable: true,
2473
2463
  initializer: function initializer() {
2474
2464
  return 0;
2475
2465
  }
2476
- }), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
2466
+ }), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
2477
2467
  enumerable: true,
2478
2468
  initializer: function initializer() {
2479
2469
  return [];
2480
2470
  }
2481
- }), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
2471
+ }), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
2482
2472
  enumerable: true,
2483
2473
  initializer: function initializer() {
2484
2474
  return [];
2485
2475
  }
2486
- }), _descriptor11 = _applyDecoratedDescriptor(_class3.prototype, 'storageCardNo', [_mobx.observable], {
2476
+ }), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'storageCardNo', [_mobx.observable], {
2487
2477
  enumerable: true,
2488
2478
  initializer: function initializer() {
2489
2479
  return null;
2490
2480
  }
2491
- }), _descriptor12 = _applyDecoratedDescriptor(_class3.prototype, 'balance', [_mobx.observable], {
2481
+ }), _descriptor11 = _applyDecoratedDescriptor(_class3.prototype, 'balance', [_mobx.observable], {
2492
2482
  enumerable: true,
2493
2483
  initializer: function initializer() {
2494
2484
  return null;
2495
2485
  }
2496
- }), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor13 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
2486
+ }), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor12 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
2497
2487
  enumerable: true,
2498
2488
  initializer: function initializer() {
2499
- var _this21 = this;
2489
+ var _this20 = this;
2500
2490
 
2501
2491
  return function () {
2502
- _this21.checkList = [];
2492
+ _this20.checkList = [];
2503
2493
  };
2504
2494
  }
2505
- }), _applyDecoratedDescriptor(_class3.prototype, 'updateMemberStorageCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'updateMemberStorageCardNo'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'updateCardInfo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'updateCardInfo'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor14 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
2495
+ }), _applyDecoratedDescriptor(_class3.prototype, 'updateMemberStorageCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'updateMemberStorageCardNo'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'updateCardInfo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'updateCardInfo'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor13 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
2506
2496
  enumerable: true,
2507
2497
  initializer: function initializer() {
2508
- var _this22 = this;
2498
+ var _this21 = this;
2509
2499
 
2510
2500
  return function (id, couponNum, promoMethodEnum, nominalAmount, promoDiscount) {
2511
- _this22.currentMode.djqs.forEach(function (ele) {
2501
+ _this21.currentMode.djqs.forEach(function (ele) {
2512
2502
  if (ele.id === id) {
2513
- promoMethodEnum == "CASH_COUPON" ? ele.amount = nominalAmount : ele.amount = promoDiscount;
2503
+ ele.amount = promoDiscount;
2504
+ promoMethodEnum == "CASH_COUPON" && (ele.nominalAmount = nominalAmount);
2514
2505
  ele.couponCategoryEnum = couponNum;
2515
2506
  var IsEnable = ele.couponCategoryEnum === 'RIGUP' || ele.couponCategoryEnum === 'UN_MATCH' || ele.couponCategoryEnum === "PREPARING" || ele.couponCategoryEnum === 'PROMO_LIMITED' || ele.couponCategoryEnum === 'COUPON_CONFLICT' ? false : true;
2516
2507
  ele.IsEnable = IsEnable;
@@ -2518,16 +2509,17 @@ var PayMode = exports.PayMode = (_class3 = function () {
2518
2509
  });
2519
2510
  };
2520
2511
  }
2521
- }), _descriptor15 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
2512
+ }), _descriptor14 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
2522
2513
  enumerable: true,
2523
2514
  initializer: function initializer() {
2524
- var _this23 = this;
2515
+ var _this22 = this;
2525
2516
 
2526
- return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
2517
+ return function (promoCouponCode, name, IsEnable, nominalAmount, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
2527
2518
  var djq = {
2528
2519
  promoCouponCode: promoCouponCode,
2529
2520
  name: name,
2530
2521
  IsEnable: IsEnable,
2522
+ nominalAmount: nominalAmount,
2531
2523
  amount: amount,
2532
2524
  doorsill: doorsill,
2533
2525
  LastTS: LastTS,
@@ -2543,25 +2535,25 @@ var PayMode = exports.PayMode = (_class3 = function () {
2543
2535
  couponCategoryEnum: couponCategoryEnum,
2544
2536
  id: id
2545
2537
  };
2546
- _this23.currentMode.djqs.push(djq);
2538
+ _this22.currentMode.djqs.push(djq);
2547
2539
  };
2548
2540
  }
2549
2541
  }), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'reCalculationDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'reCalculationDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clearDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clearDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'setCurrentModeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'setCurrentModeValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcMemberBalance', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcMemberBalance'), _class3.prototype)), _class3);
2550
2542
  var Member = exports.Member = (_class5 = function () {
2551
2543
  function Member(m) {
2552
- var _this24 = this;
2544
+ var _this23 = this;
2553
2545
 
2554
2546
  (0, _classCallCheck3.default)(this, Member);
2555
2547
 
2556
- _initDefineProp(this, 'cardNo', _descriptor16, this);
2548
+ _initDefineProp(this, 'cardNo', _descriptor15, this);
2557
2549
 
2558
- _initDefineProp(this, 'balance', _descriptor17, this);
2550
+ _initDefineProp(this, 'balance', _descriptor16, this);
2559
2551
 
2560
- _initDefineProp(this, 'exchangable', _descriptor18, this);
2552
+ _initDefineProp(this, 'exchangable', _descriptor17, this);
2561
2553
 
2562
- _initDefineProp(this, 'meStorageCardId', _descriptor19, this);
2554
+ _initDefineProp(this, 'meStorageCardId', _descriptor18, this);
2563
2555
 
2564
- _initDefineProp(this, 'storageCardNo', _descriptor20, this);
2556
+ _initDefineProp(this, 'storageCardNo', _descriptor19, this);
2565
2557
 
2566
2558
  if (m) {
2567
2559
  this.id = m.ID;
@@ -2576,11 +2568,11 @@ var Member = exports.Member = (_class5 = function () {
2576
2568
  isNewRetailBCPos = _ref31.isNewRetailBCPos;
2577
2569
 
2578
2570
  (0, _mobx.runInAction)(function () {
2579
- _this24.cardNo = m.CardCode;
2571
+ _this23.cardNo = m.CardCode;
2580
2572
  if (index >= 0) {
2581
- _this24.balance = parseFloat(m.DynamicPropertyValues[index]);
2573
+ _this23.balance = parseFloat(m.DynamicPropertyValues[index]);
2582
2574
  } else {
2583
- _this24.balance = _this24.rawbalance;
2575
+ _this23.balance = _this23.rawbalance;
2584
2576
  }
2585
2577
  });
2586
2578
  this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
@@ -2602,19 +2594,19 @@ var Member = exports.Member = (_class5 = function () {
2602
2594
  }
2603
2595
  }]);
2604
2596
  return Member;
2605
- }(), (_descriptor16 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
2597
+ }(), (_descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
2606
2598
  enumerable: true,
2607
2599
  initializer: null
2608
- }), _descriptor17 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
2600
+ }), _descriptor16 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
2609
2601
  enumerable: true,
2610
2602
  initializer: null
2611
- }), _descriptor18 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
2603
+ }), _descriptor17 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
2612
2604
  enumerable: true,
2613
2605
  initializer: null
2614
- }), _descriptor19 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
2606
+ }), _descriptor18 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
2615
2607
  enumerable: true,
2616
2608
  initializer: null
2617
- }), _descriptor20 = _applyDecoratedDescriptor(_class5.prototype, 'storageCardNo', [_mobx.observable], {
2609
+ }), _descriptor19 = _applyDecoratedDescriptor(_class5.prototype, 'storageCardNo', [_mobx.observable], {
2618
2610
  enumerable: true,
2619
2611
  initializer: null
2620
2612
  }), _applyDecoratedDescriptor(_class5.prototype, 'setExchangable', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setExchangable'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setCardNo'), _class5.prototype)), _class5);