bxs-tools-ui 1.5.0 → 1.5.1

package/lib/add-and-take/index.js

@@ -1343,8 +1343,8 @@ module.exports = function GetIntrinsic(name, allowMissing) {
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_9fbec60c_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(108);
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_9fbec60c_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_9fbec60c_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_709ddead_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(108);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_709ddead_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_709ddead_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -3345,11 +3345,11 @@ __webpack_require__.r(__webpack_exports__);
 var defineProperty = __webpack_require__(26);
 var defineProperty_default = /*#__PURE__*/__webpack_require__.n(defineProperty);
 
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/add-and-take/index.vue?vue&type=template&id=9fbec60c&
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/add-and-take/index.vue?vue&type=template&id=709ddead&
 
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { defineProperty_default()(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var add_and_takevue_type_template_id_9fbec60c_render = function render() {
+var add_and_takevue_type_template_id_709ddead_render = function render() {
   var _vm = this,
     _c = _vm._self._c,
     _setup = _vm._self._setupProxy;
@@ -3645,7 +3645,7 @@ var add_and_takevue_type_template_id_9fbec60c_render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=9fbec60c&
+// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=709ddead&
 
 // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
 var tslib_es6 = __webpack_require__(0);
@@ -4620,7 +4620,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
         var _a;
         if (newAccountData === void 0) { newAccountData = null; }
         return Object(tslib_es6["b" /* __awaiter */])(this, void 0, void 0, function () {
-            var _formValus, _b, params, type, personData, productData, accountData, _resultUuid, apis, api, url, reqParams, cloneProductData_2;
+            var _formValus, _b, params, type, personData, productData, accountData, _resultUuid, effectAccountData, apis, api, url, reqParams, cloneProductData_2;
             var _c;
             var _this = this;
             return Object(tslib_es6["e" /* __generator */])(this, function (_d) {
@@ -4633,6 +4633,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                         }
                         _b = this, params = _b.params, type = _b.type, personData = _b.personData, productData = _b.productData, accountData = _b.accountData;
                         _resultUuid = Object(lodash["get"])(this, 'resultData.uuid');
+                        effectAccountData = newAccountData ? newAccountData : accountData;
                         apis = {
                             addAndTake: '/interest/addAndTake/detail',
                             draw: '/interest/draw/detail',
@@ -4655,7 +4656,9 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                             },
                             _c.yearBonusRate = _formValus.yearBonusRate,
                             _c.latestYearBonusRate = _formValus.latestYearBonusRate,
-                            _c[type === 'reduceBaof' ? 'drawData' : 'addAndTakeData'] = newAccountData ? newAccountData.addAndTakeData : null,
+                            _c[type === 'reduceBaof' ? 'drawData' : 'addAndTakeData'] = effectAccountData
+                                ? effectAccountData.addAndTakeData
+                                : null,
                             _c);
                         if (!_resultUuid) {
                             cloneProductData_2 = Object(planbook["f" /* convertProductData */])(Object(lodash["cloneDeep"])(productData));
@@ -4977,8 +4980,8 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=script&lang=ts&
  /* harmony default export */ var packages_add_and_takevue_type_script_lang_ts_ = (add_and_takevue_type_script_lang_ts_); 
-// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=9fbec60c&prod&lang=css&
-var add_and_takevue_type_style_index_0_id_9fbec60c_prod_lang_css_ = __webpack_require__(137);
+// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=709ddead&prod&lang=css&
+var add_and_takevue_type_style_index_0_id_709ddead_prod_lang_css_ = __webpack_require__(137);
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue
 
@@ -4991,7 +4994,7 @@ var add_and_takevue_type_style_index_0_id_9fbec60c_prod_lang_css_ = __webpack_re
 
 var add_and_take_component = Object(componentNormalizer["a" /* default */])(
   packages_add_and_takevue_type_script_lang_ts_,
-  add_and_takevue_type_template_id_9fbec60c_render,
+  add_and_takevue_type_template_id_709ddead_render,
   staticRenderFns,
   false,
   null,

package/lib/index.js

@@ -27225,8 +27225,8 @@ module.exports = function (str, opts) {
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_9fbec60c_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(56);
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_9fbec60c_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_9fbec60c_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_709ddead_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(56);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_709ddead_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_709ddead_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -34084,11 +34084,11 @@ __webpack_require__.d(__webpack_exports__, "ProductInfo", function() { return /*
 var defineProperty = __webpack_require__(8);
 var defineProperty_default = /*#__PURE__*/__webpack_require__.n(defineProperty);
 
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/add-and-take/index.vue?vue&type=template&id=9fbec60c&
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/add-and-take/index.vue?vue&type=template&id=709ddead&
 
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { defineProperty_default()(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var add_and_takevue_type_template_id_9fbec60c_render = function render() {
+var add_and_takevue_type_template_id_709ddead_render = function render() {
   var _vm = this,
     _c = _vm._self._c,
     _setup = _vm._self._setupProxy;
@@ -34384,7 +34384,7 @@ var add_and_takevue_type_template_id_9fbec60c_render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=9fbec60c&
+// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=709ddead&
 
 // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
 var tslib_es6 = __webpack_require__(0);
@@ -36225,7 +36225,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
         var _a;
         if (newAccountData === void 0) { newAccountData = null; }
         return Object(tslib_es6["b" /* __awaiter */])(this, void 0, void 0, function () {
-            var _formValus, _b, params, type, personData, productData, accountData, _resultUuid, apis, api, url, reqParams, cloneProductData_2;
+            var _formValus, _b, params, type, personData, productData, accountData, _resultUuid, effectAccountData, apis, api, url, reqParams, cloneProductData_2;
             var _c;
             var _this = this;
             return Object(tslib_es6["e" /* __generator */])(this, function (_d) {
@@ -36238,6 +36238,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                         }
                         _b = this, params = _b.params, type = _b.type, personData = _b.personData, productData = _b.productData, accountData = _b.accountData;
                         _resultUuid = Object(lodash["get"])(this, 'resultData.uuid');
+                        effectAccountData = newAccountData ? newAccountData : accountData;
                         apis = {
                             addAndTake: '/interest/addAndTake/detail',
                             draw: '/interest/draw/detail',
@@ -36260,7 +36261,9 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                             },
                             _c.yearBonusRate = _formValus.yearBonusRate,
                             _c.latestYearBonusRate = _formValus.latestYearBonusRate,
-                            _c[type === 'reduceBaof' ? 'drawData' : 'addAndTakeData'] = newAccountData ? newAccountData.addAndTakeData : null,
+                            _c[type === 'reduceBaof' ? 'drawData' : 'addAndTakeData'] = effectAccountData
+                                ? effectAccountData.addAndTakeData
+                                : null,
                             _c);
                         if (!_resultUuid) {
                             cloneProductData_2 = Object(product["b" /* convertProductData */])(Object(lodash["cloneDeep"])(productData));
@@ -36582,8 +36585,8 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=script&lang=ts&
  /* harmony default export */ var packages_add_and_takevue_type_script_lang_ts_ = (add_and_takevue_type_script_lang_ts_); 
-// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=9fbec60c&prod&lang=css&
-var add_and_takevue_type_style_index_0_id_9fbec60c_prod_lang_css_ = __webpack_require__(110);
+// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=709ddead&prod&lang=css&
+var add_and_takevue_type_style_index_0_id_709ddead_prod_lang_css_ = __webpack_require__(110);
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue
 
@@ -36596,7 +36599,7 @@ var add_and_takevue_type_style_index_0_id_9fbec60c_prod_lang_css_ = __webpack_re
 
 var add_and_take_component = normalizeComponent(
   packages_add_and_takevue_type_script_lang_ts_,
-  add_and_takevue_type_template_id_9fbec60c_render,
+  add_and_takevue_type_template_id_709ddead_render,
   staticRenderFns,
   false,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bxs-tools-ui",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "微易前端业务组件",
   "main": "lib/index.js",
   "files": [

package/packages/add-and-take/index.vue

@@ -556,6 +556,7 @@ export default class AddAndTake extends Vue {
     }
     const { params, type, personData, productData, accountData } = this;
     const _resultUuid = _get(this, 'resultData.uuid');
+    const effectAccountData = newAccountData ? newAccountData : accountData;
     const apis = {
       addAndTake: '/interest/addAndTake/detail',
       draw: '/interest/draw/detail',
@@ -577,7 +578,9 @@ export default class AddAndTake extends Vue {
       },
       yearBonusRate: _formValus.yearBonusRate,
       latestYearBonusRate: _formValus.latestYearBonusRate,
-      [type === 'reduceBaof' ? 'drawData' : 'addAndTakeData']: newAccountData ? newAccountData.addAndTakeData : null
+      [type === 'reduceBaof' ? 'drawData' : 'addAndTakeData']: effectAccountData
+        ? effectAccountData.addAndTakeData
+        : null
     };
     if (!_resultUuid) {
       const cloneProductData = convertProductData(cloneDeep(productData));