From cc01607ad15fa69ad52bc0c81e8cfdc4b7effed8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 30 五月 2025 17:16:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
wx/unpackage/dist/dev/mp-weixin/pages/addition_subtraction/addition_subtraction.js | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/wx/unpackage/dist/dev/mp-weixin/pages/addition_subtraction/addition_subtraction.js b/wx/unpackage/dist/dev/mp-weixin/pages/addition_subtraction/addition_subtraction.js
index f361900..3015977 100644
--- a/wx/unpackage/dist/dev/mp-weixin/pages/addition_subtraction/addition_subtraction.js
+++ b/wx/unpackage/dist/dev/mp-weixin/pages/addition_subtraction/addition_subtraction.js
@@ -103,16 +103,16 @@
try {
components = {
uTabs: function () {
- return Promise.all(/*! import() | node-modules/uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-tabs/u-tabs.vue */ 431))
+ return Promise.all(/*! import() | node-modules/uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-tabs/u-tabs.vue */ 441))
},
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))
},
uToast: function () {
- return __webpack_require__.e(/*! import() | node-modules/uview-ui/components/u-toast/u-toast */ "node-modules/uview-ui/components/u-toast/u-toast").then(__webpack_require__.bind(null, /*! uview-ui/components/u-toast/u-toast.vue */ 485))
+ return __webpack_require__.e(/*! import() | node-modules/uview-ui/components/u-toast/u-toast */ "node-modules/uview-ui/components/u-toast/u-toast").then(__webpack_require__.bind(null, /*! uview-ui/components/u-toast/u-toast.vue */ 495))
},
uPopup: function () {
- return Promise.all(/*! import() | node-modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-popup/u-popup.vue */ 492))
+ return Promise.all(/*! import() | node-modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-popup/u-popup.vue */ 502))
},
}
} catch (e) {
@@ -325,6 +325,7 @@
//
//
//
+//
var _default = {
data: function data() {
return {
@@ -373,7 +374,12 @@
// 鎬婚噾棰�
totalPrice: function totalPrice() {
// return (this.cyclePrice * (this.add.length + this.del.length)).toFixed(2)
- return (this.cyclePrice * this.add.length - this.cyclePrice * this.del.length).toFixed(2);
+ var totalReductPrice = 0;
+ this.del.forEach(function (item) {
+ totalReductPrice = totalReductPrice + item.fee;
+ });
+ // return ((this.cyclePrice * this.add.length) - (this.cyclePrice * this.del.length)).toFixed(2)
+ return (this.cyclePrice * this.add.length + totalReductPrice).toFixed(2);
}
},
methods: {
@@ -410,7 +416,7 @@
memberName: item.name,
workTypeName: item.gzName,
worktypeId: item.gzId,
- fee: _this2.cyclePrice
+ fee: item.fee
};
});
this.$u.api.applyChangeCreate({
--
Gitblit v1.9.3