Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-05-30 cc01607ad15fa69ad52bc0c81e8cfdc4b7effed8

 wx/unpackage/dist/dev/mp-weixin/pages/addition_subtraction_application/addition_subtraction_application.js

@@ -103,25 +103,25 @@
try {
  components = {
    "u-Form": function () {
      return Promise.all(/*! import() | node-modules/uview-ui/components/u--form/u--form */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u--form/u--form")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u--form/u--form.vue */ 439))
      return Promise.all(/*! import() | node-modules/uview-ui/components/u--form/u--form */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u--form/u--form")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u--form/u--form.vue */ 449))
    },
    uFormItem: function () {
      return Promise.all(/*! import() | node-modules/uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-form-item/u-form-item.vue */ 445))
      return Promise.all(/*! import() | node-modules/uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-form-item/u-form-item.vue */ 455))
    },
    "u-Input": function () {
      return Promise.all(/*! import() | node-modules/uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u--input/u--input.vue */ 453))
      return Promise.all(/*! import() | node-modules/uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u--input/u--input.vue */ 463))
    },
    uIcon: function () {
      return Promise.all(/*! import() | node-modules/uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-icon/u-icon.vue */ 459))
      return Promise.all(/*! import() | node-modules/uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-icon/u-icon.vue */ 469))
    },
    uButton: function () {
      return Promise.all(/*! import() | node-modules/uview-ui/components/u-button/u-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-button/u-button")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-button/u-button.vue */ 406))
      return Promise.all(/*! import() | node-modules/uview-ui/components/u-button/u-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-button/u-button")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-button/u-button.vue */ 416))
    },
    uPicker: function () {
      return Promise.all(/*! import() | node-modules/uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-picker/u-picker.vue */ 468))
      return Promise.all(/*! import() | node-modules/uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-picker/u-picker.vue */ 478))
    },
    uDatetimePicker: function () {
      return Promise.all(/*! import() | node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-datetime-picker/u-datetime-picker.vue */ 476))
      return Promise.all(/*! import() | node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-datetime-picker/u-datetime-picker.vue */ 486))
    },
  }
} catch (e) {
@@ -198,7 +198,6 @@
exports.default = void 0;
var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 55));
var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 57));
//
//
//
//
@@ -358,6 +357,7 @@
                      _this2.maxDate = _this2.formatTimeStamp(e.value[0].endTime);
                    }
                  }
                  _this2.confirm2();
                  _this2.show = false;
                }
              case 4:
@@ -389,6 +389,20 @@
        }
      });
    },
    confirm2: function confirm2(e) {
      var _this4 = this;
      this.$u.api.getChangeCountCyclePriceVO({
        applyId: this.id,
        validTime: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd') + ' 00:00:00'
      }).then(function (res) {
        if (res.code === 200) {
          _this4.model.cyclePrice = res.data.cyclePrice;
          _this4.show1 = false;
        } else {
          _this4.model.startDate = '';
        }
      });
    },
    // 获取明天日期
    getTomorrow: function getTomorrow() {
      var today = new Date();
@@ -417,10 +431,10 @@
      return "".concat(year, "-").concat(month, "-").concat(day);
    },
    submit: function submit() {
      var _this4 = this;
      var _this5 = this;
      this.$refs.uForm.validate().then(function (res) {
        uni.navigateTo({
          url: "/pages/addition_subtraction/addition_subtraction?id=".concat(_this4.model.id, "&codeId=").concat(_this4.id, "&cyclePrice=").concat(_this4.model.cyclePrice, "&startDate=").concat(_this4.model.startDate, "&code=").concat(_this4.model.code)
          url: "/pages/addition_subtraction/addition_subtraction?id=".concat(_this5.model.id, "&codeId=").concat(_this5.id, "&cyclePrice=").concat(_this5.model.cyclePrice, "&startDate=").concat(_this5.model.startDate, "&code=").concat(_this5.model.code)
        });
      }).catch(function (errors) {});
    }